[libgsf] Allow the huge libxml parser mode so that gnumeric can load large images. [#705100]



commit 726234d47b68f61dc48cb4abe871ad745e733d45
Author: Jean Brefort <jean brefort normalesup org>
Date:   Tue Jul 30 16:18:31 2013 +0200

    Allow the huge libxml parser mode so that gnumeric can load large images. [#705100]

 ChangeLog        |    5 +++++
 NEWS             |    4 ++++
 gsf/gsf-libxml.c |    5 +++--
 3 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9e4c82d..65887ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-30  Jean Brefort  <jean brefort normalesup org>
+
+       * gsf/gsf-libxml.c (gsf_xml_parser_context_full): allow the huge libxml
+       parser mode so that gnumeric can load large images. [#705100]
+
 2013-07-11  Morten Welinder  <terra gnome org>
 
        * gsf/gsf-msole-utils.c (msole_metadata_write_string): Protect
diff --git a/NEWS b/NEWS
index 345ab86..162b483 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,10 @@ libgsf 1.14.28
 Andreas:
        * Fix conversion specifiers. [#703064]
 
+Jean:
+       * Allow the huge libxml parser mode so that gnumeric can load large images.
+       [#705100]
+
 Morten:
        * Fix problem with bogus metadata.  [#703952]
 
diff --git a/gsf/gsf-libxml.c b/gsf/gsf-libxml.c
index 7980361..e632297 100644
--- a/gsf/gsf-libxml.c
+++ b/gsf/gsf-libxml.c
@@ -328,9 +328,10 @@ gsf_xml_parser_context_full (GsfInput *input, xmlSAXHandlerPtr sax, gpointer use
                (xmlInputCloseCallback) gsf_libxml_close,
                input, XML_CHAR_ENCODING_NONE);
 
-       if (res)
+       if (res) {
                res->replaceEntities = TRUE;
-       else
+               res->options |= XML_PARSE_HUGE;
+       } else
                g_object_unref (input);
 
        return res;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]