[xml/sgml-commit] r1229 - in /packages/libxml2: ./ trunk/debian/changelog trunk/error.c

[glandium at users.alioth.debian.org]

Author: glandium
Date: Sat Sep 13 07:34:15 2008
New Revision: 1229

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1229
Log:
 r1332 at jigen:  mh | 2008-03-05 23:42:30 +0100
 * error.c: Don't grow error buffer indefinitely when vsnprintf returns -1,
   which, if it happens, on glibc-based systems, will happen indefinitely.
   Closes: #456653.

Modified:
    packages/libxml2/   (props changed)
    packages/libxml2/trunk/debian/changelog
    packages/libxml2/trunk/error.c

Propchange: packages/libxml2/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Sep 13 07:34:15 2008
@@ -1,2 +1,2 @@
 85a06573-1206-0410-a182-ce9117885d71:/local/libxml2:296
-a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxml2:1331
+a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxml2:1332

Modified: packages/libxml2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/debian/changelog?rev=1229&op=diff
==============================================================================
--- packages/libxml2/trunk/debian/changelog (original)
+++ packages/libxml2/trunk/debian/changelog Sat Sep 13 07:34:15 2008
@@ -5,6 +5,9 @@
   * xstc/Makefile.am, xstc/Makefile.in: Properly clean generated files.
   * nanohttp.c: Apply fix from svn revision 3685 to allocate enough memory
     for the Host HTTP header when containing a port number. Closes: #464173.
+  * error.c: Don't grow error buffer indefinitely when vsnprintf returns -1,
+    which, if it happens, on glibc-based systems, will happen indefinitely.
+    Closes: #456653.
 
  -- Mike Hommey <glandium at debian.org>  Tue, 04 Mar 2008 22:36:28 +0100
 

Modified: packages/libxml2/trunk/error.c
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/libxml2/trunk/error.c?rev=1229&op=diff
==============================================================================
--- packages/libxml2/trunk/error.c (original)
+++ packages/libxml2/trunk/error.c Sat Sep 13 07:34:15 2008
@@ -45,7 +45,7 @@
 	if (chars > -1)						\
 	    size += chars + 1;					\
 	else							\
-	    size += 100;					\
+	    break;						\
 	if ((larger = (char *) xmlRealloc(str, size)) == NULL) {\
 	    break;						\
 	}							\