From: Jim Evins Date: Sun, 26 Jul 2009 03:43:22 +0000 (+0000) Subject: 2009-07-25 Jim Evins X-Git-Tag: glabels-2_3_0~215 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=eedb5bf0e10f9fa4feb1137381f2aa2e5cf33f28;p=glabels 2009-07-25 Jim Evins * src/xml-label.c: (gl_xml_label_open): Relax limits when parsing file. Allows large embedded image files. git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@855 f5e0f49d-192f-0410-a22d-a8d8700d0965 --- diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog index 3d24085b..eb149be5 100644 --- a/glabels2/ChangeLog +++ b/glabels2/ChangeLog @@ -1,4 +1,10 @@ -2009-05-19 Jim Evins +2009-07-25 Jim Evins + + * src/xml-label.c: (gl_xml_label_open): + Relax limits when parsing file. Allows large embedded image + files. + +2009-05-19 Jim Evins * configure.in: * po/LINGUAS: diff --git a/glabels2/src/xml-label.c b/glabels2/src/xml-label.c index defc5dee..25707101 100644 --- a/glabels2/src/xml-label.c +++ b/glabels2/src/xml-label.c @@ -184,7 +184,7 @@ gl_xml_label_open (const gchar *utf8_filename, filename = g_filename_from_utf8 (utf8_filename, -1, NULL, NULL, NULL); g_return_val_if_fail (filename, NULL); - doc = xmlParseFile (filename); + doc = xmlReadFile (filename, NULL, XML_PARSE_HUGE); if (!doc) { g_message (_("xmlParseFile error")); *status = XML_LABEL_ERROR_OPEN_PARSE; @@ -221,7 +221,7 @@ gl_xml_label_open_buffer (const gchar *buffer, gl_debug (DEBUG_XML, "START"); - doc = xmlParseDoc ((xmlChar *) buffer); + doc = xmlReadDoc ((xmlChar *) buffer, NULL, NULL, XML_PARSE_HUGE); if (!doc) { g_message (_("xmlParseFile error")); *status = XML_LABEL_ERROR_OPEN_PARSE;