From ad8b2111a0e5330aca1739fcf35658376b2970a8 Mon Sep 17 00:00:00 2001
From: Aron Xu <aron@debian.org>
Date: Wed, 9 Jul 2014 05:15:30 +0800
Subject: New round of cherry-picking upstream fixes

---
 ...-calls-to-xml-and-html-Read-parsing-entry.patch | 148 +++++++++++++++++++++
 1 file changed, 148 insertions(+)
 create mode 100644 debian/patches/0021-adding-init-calls-to-xml-and-html-Read-parsing-entry.patch

(limited to 'debian/patches/0021-adding-init-calls-to-xml-and-html-Read-parsing-entry.patch')

diff --git a/debian/patches/0021-adding-init-calls-to-xml-and-html-Read-parsing-entry.patch b/debian/patches/0021-adding-init-calls-to-xml-and-html-Read-parsing-entry.patch
new file mode 100644
index 0000000..7820411
--- /dev/null
+++ b/debian/patches/0021-adding-init-calls-to-xml-and-html-Read-parsing-entry.patch
@@ -0,0 +1,148 @@
+From: Daniel Veillard <veillard@redhat.com>
+Date: Mon, 9 Dec 2013 15:23:40 +0800
+Subject: adding init calls to xml and html Read parsing entry points
+
+As pointed out by "Tassyns, Bram <BramT@enfocus.com>" on the list
+some call had it other didn't, clean it up and add to all missing
+ones
+---
+ HTMLparser.c |    6 ++++++
+ parser.c     |   10 ++++++++++
+ 2 files changed, 16 insertions(+)
+
+diff --git a/HTMLparser.c b/HTMLparser.c
+index dd0c1ea..44c1a3c 100644
+--- a/HTMLparser.c
++++ b/HTMLparser.c
+@@ -6808,6 +6808,7 @@ htmlReadFd(int fd, const char *URL, const char *encoding, int options)
+ 
+     if (fd < 0)
+         return (NULL);
++    xmlInitParser();
+ 
+     xmlInitParser();
+     input = xmlParserInputBufferCreateFd(fd, XML_CHAR_ENCODING_NONE);
+@@ -6898,6 +6899,7 @@ htmlCtxtReadDoc(htmlParserCtxtPtr ctxt, const xmlChar * cur,
+         return (NULL);
+     if (ctxt == NULL)
+         return (NULL);
++    xmlInitParser();
+ 
+     htmlCtxtReset(ctxt);
+ 
+@@ -6931,6 +6933,7 @@ htmlCtxtReadFile(htmlParserCtxtPtr ctxt, const char *filename,
+         return (NULL);
+     if (ctxt == NULL)
+         return (NULL);
++    xmlInitParser();
+ 
+     htmlCtxtReset(ctxt);
+ 
+@@ -6967,6 +6970,7 @@ htmlCtxtReadMemory(htmlParserCtxtPtr ctxt, const char *buffer, int size,
+         return (NULL);
+     if (buffer == NULL)
+         return (NULL);
++    xmlInitParser();
+ 
+     htmlCtxtReset(ctxt);
+ 
+@@ -7009,6 +7013,7 @@ htmlCtxtReadFd(htmlParserCtxtPtr ctxt, int fd,
+         return (NULL);
+     if (ctxt == NULL)
+         return (NULL);
++    xmlInitParser();
+ 
+     htmlCtxtReset(ctxt);
+ 
+@@ -7053,6 +7058,7 @@ htmlCtxtReadIO(htmlParserCtxtPtr ctxt, xmlInputReadCallback ioread,
+         return (NULL);
+     if (ctxt == NULL)
+         return (NULL);
++    xmlInitParser();
+ 
+     htmlCtxtReset(ctxt);
+ 
+diff --git a/parser.c b/parser.c
+index dd00399..ad400f4 100644
+--- a/parser.c
++++ b/parser.c
+@@ -15217,6 +15217,7 @@ xmlReadDoc(const xmlChar * cur, const char *URL, const char *encoding, int optio
+ 
+     if (cur == NULL)
+         return (NULL);
++    xmlInitParser();
+ 
+     ctxt = xmlCreateDocParserCtxt(cur);
+     if (ctxt == NULL)
+@@ -15239,6 +15240,7 @@ xmlReadFile(const char *filename, const char *encoding, int options)
+ {
+     xmlParserCtxtPtr ctxt;
+ 
++    xmlInitParser();
+     ctxt = xmlCreateURLParserCtxt(filename, options);
+     if (ctxt == NULL)
+         return (NULL);
+@@ -15262,6 +15264,7 @@ xmlReadMemory(const char *buffer, int size, const char *URL, const char *encodin
+ {
+     xmlParserCtxtPtr ctxt;
+ 
++    xmlInitParser();
+     ctxt = xmlCreateMemoryParserCtxt(buffer, size);
+     if (ctxt == NULL)
+         return (NULL);
+@@ -15290,6 +15293,7 @@ xmlReadFd(int fd, const char *URL, const char *encoding, int options)
+ 
+     if (fd < 0)
+         return (NULL);
++    xmlInitParser();
+ 
+     input = xmlParserInputBufferCreateFd(fd, XML_CHAR_ENCODING_NONE);
+     if (input == NULL)
+@@ -15333,6 +15337,7 @@ xmlReadIO(xmlInputReadCallback ioread, xmlInputCloseCallback ioclose,
+ 
+     if (ioread == NULL)
+         return (NULL);
++    xmlInitParser();
+ 
+     input = xmlParserInputBufferCreateIO(ioread, ioclose, ioctx,
+                                          XML_CHAR_ENCODING_NONE);
+@@ -15379,6 +15384,7 @@ xmlCtxtReadDoc(xmlParserCtxtPtr ctxt, const xmlChar * cur,
+         return (NULL);
+     if (ctxt == NULL)
+         return (NULL);
++    xmlInitParser();
+ 
+     xmlCtxtReset(ctxt);
+ 
+@@ -15412,6 +15418,7 @@ xmlCtxtReadFile(xmlParserCtxtPtr ctxt, const char *filename,
+         return (NULL);
+     if (ctxt == NULL)
+         return (NULL);
++    xmlInitParser();
+ 
+     xmlCtxtReset(ctxt);
+ 
+@@ -15448,6 +15455,7 @@ xmlCtxtReadMemory(xmlParserCtxtPtr ctxt, const char *buffer, int size,
+         return (NULL);
+     if (buffer == NULL)
+         return (NULL);
++    xmlInitParser();
+ 
+     xmlCtxtReset(ctxt);
+ 
+@@ -15492,6 +15500,7 @@ xmlCtxtReadFd(xmlParserCtxtPtr ctxt, int fd,
+         return (NULL);
+     if (ctxt == NULL)
+         return (NULL);
++    xmlInitParser();
+ 
+     xmlCtxtReset(ctxt);
+ 
+@@ -15537,6 +15546,7 @@ xmlCtxtReadIO(xmlParserCtxtPtr ctxt, xmlInputReadCallback ioread,
+         return (NULL);
+     if (ctxt == NULL)
+         return (NULL);
++    xmlInitParser();
+ 
+     xmlCtxtReset(ctxt);
+ 
-- 
cgit v1.2.3