[gentoo-commits] gentoo-x86 commit in dev-libs/libxml2/files: libxml2-2.7.4-parser-grow.patch

["Romain Perier (mrpouet)" <mrpouet@gentoo.org>]

mrpouet     09/09/16 08:05:17

  Added:                libxml2-2.7.4-parser-grow.patch
  Log:
  Fix inkscape extension loader problem per bug #285125, patch import from upstream bug #595128, thanks to Andreas Proteus <proteuss@sdf.lonestar.org> for tests
  (Portage version: 2.2_rc40/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-libs/libxml2/files/libxml2-2.7.4-parser-grow.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libxml2/files/libxml2-2.7.4-parser-grow.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libxml2/files/libxml2-2.7.4-parser-grow.patch?rev=1.1&content-type=text/plain

Index: libxml2-2.7.4-parser-grow.patch
===================================================================
From 9d3d141c412baa5c713ad3df48f1a4d179e07b05 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@redhat.com>
Date: Tue, 15 Sep 2009 16:41:30 +0000
Subject: Fix a parsing problem with little data at startup

* parser.c: inkscape extension loader (and possibly others) feed
  data to the parser very slowly, 0 at start, 4 bytes on first GROW
  and this broke after the fix for
  https://bugzilla.gnome.org/show_bug.cgi?id=566012
  http://git.gnome.org/cgit/libxml2/commit/?id=7e385bd4e28a0cc12b6b26ed178c620e3c3ab8d8
  leading to another bug
  https://bugzilla.redhat.com/show_bug.cgi?id=523002
  this detects the situation and GROW when needed for proper processing.
---
diff --git a/parser.c b/parser.c
index e415339..b41dcc3 100644
--- a/parser.c
+++ b/parser.c
@@ -10130,8 +10130,12 @@ xmlParseDocument(xmlParserCtxtPtr ctxt) {
     /*
      * Check for the XMLDecl in the Prolog.
      * do not GROW here to avoid the detected encoder to decode more
-     * than just the first line
+     * than just the first line, unless the amount of data is really
+     * too small to hold "<?xml version="1.0" encoding="foo"
      */
+    if ((ctxt->input->end - ctxt->input->cur) < 35) {
+       GROW;
+    }
     if ((CMP5(CUR_PTR, '<', '?', 'x', 'm', 'l')) && (IS_BLANK_CH(NXT(5)))) {
 
 	/*
--
cgit v0.8.2