summaryrefslogtreecommitdiffstats
path: root/extra/libxml2/zlib.patch
diff options
context:
space:
mode:
authorsibelle <lesibel@free.fr>2010-03-08 06:55:28 +0100
committersibelle <lesibel@free.fr>2010-03-08 06:55:28 +0100
commitb85352770005fa6adbcfae38871e7fe31d4de296 (patch)
tree10ec83ef4d679d2b1af16b0a1bc066e8a8def2ca /extra/libxml2/zlib.patch
parentfac2ae4b5bd1e813bd87cf0d93cf8772613ab03e (diff)
downloadnutyx-extra-b85352770005fa6adbcfae38871e7fe31d4de296.tar.gz
nutyx-extra-b85352770005fa6adbcfae38871e7fe31d4de296.tar.bz2
nutyx-extra-b85352770005fa6adbcfae38871e7fe31d4de296.tar.xz
nutyx-extra-b85352770005fa6adbcfae38871e7fe31d4de296.zip
Maj de libxml2#2.7.6-2
Diffstat (limited to 'extra/libxml2/zlib.patch')
-rw-r--r--extra/libxml2/zlib.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/extra/libxml2/zlib.patch b/extra/libxml2/zlib.patch
new file mode 100644
index 000000000..4bf486d12
--- /dev/null
+++ b/extra/libxml2/zlib.patch
@@ -0,0 +1,32 @@
+From a7e79f28689c574e0bbef17f4cb3da00249181ff Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Tue, 19 Jan 2010 15:28:48 +0000
+Subject: libxml violates the zlib interface and crashes
+
+* xmlIO.c: remove an abuse of zlib API and use a clean interface
+ available in zlib >= 1.2.3
+---
+diff --git a/xmlIO.c b/xmlIO.c
+index c03ac43..8fc00e3 100644
+--- a/xmlIO.c
++++ b/xmlIO.c
+@@ -2518,6 +2518,9 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) {
+ #ifdef HAVE_ZLIB_H
+ if ((xmlInputCallbackTable[i].opencallback == xmlGzfileOpen) &&
+ (strcmp(URI, "-") != 0)) {
++#if defined(ZLIB_VERNUM) && ZLIB_VERNUM >= 0x1230
++ ret->compressed = !gzdirect(context);
++#else
+ if (((z_stream *)context)->avail_in > 4) {
+ char *cptr, buff4[4];
+ cptr = (char *) ((z_stream *)context)->next_in;
+@@ -2529,6 +2532,7 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) {
+ gzrewind(context);
+ }
+ }
++#endif
+ }
+ #endif
+ }
+--
+cgit v0.8.3.1