From d548c999ade382febb424b26743b3c4d63159ae0 Mon Sep 17 00:00:00 2001 From: Aron Xu Date: Mon, 21 Sep 2015 22:55:08 +0800 Subject: Revert "Restore all patches available in 2.9.1+dfsg1-5 in stretch, ensuring CVE-2014-3660 is fixed too." This reverts commit 37f590756a23e167808f76f1389c36f0a2d39f11. --- ...50-Pointer-dereferenced-before-null-check.patch | 61 ---------------------- 1 file changed, 61 deletions(-) delete mode 100644 debian/patches/0050-Pointer-dereferenced-before-null-check.patch (limited to 'debian/patches/0050-Pointer-dereferenced-before-null-check.patch') diff --git a/debian/patches/0050-Pointer-dereferenced-before-null-check.patch b/debian/patches/0050-Pointer-dereferenced-before-null-check.patch deleted file mode 100644 index 9370f13..0000000 --- a/debian/patches/0050-Pointer-dereferenced-before-null-check.patch +++ /dev/null @@ -1,61 +0,0 @@ -From: Daniel Veillard -Date: Mon, 6 Oct 2014 20:07:19 +0800 -Subject: Pointer dereferenced before null check - -For https://bugzilla.gnome.org/show_bug.cgi?id=707027 - -A few pointer dereference before NULL check fixed. -Removed a useless test ---- - xmlreader.c | 17 +++++++++++++---- - 1 file changed, 13 insertions(+), 4 deletions(-) - -diff --git a/xmlreader.c b/xmlreader.c -index 9620f52..8834f50 100644 ---- a/xmlreader.c -+++ b/xmlreader.c -@@ -282,7 +282,10 @@ static void - xmlTextReaderFreeProp(xmlTextReaderPtr reader, xmlAttrPtr cur) { - xmlDictPtr dict; - -- dict = reader->ctxt->dict; -+ if ((reader != NULL) && (reader->ctxt != NULL)) -+ dict = reader->ctxt->dict; -+ else -+ dict = NULL; - if (cur == NULL) return; - - if ((__xmlRegisterCallbacks) && (xmlDeregisterNodeDefaultValue)) -@@ -319,7 +322,7 @@ xmlTextReaderFreeProp(xmlTextReaderPtr reader, xmlAttrPtr cur) { - static void - xmlTextReaderFreePropList(xmlTextReaderPtr reader, xmlAttrPtr cur) { - xmlAttrPtr next; -- if (cur == NULL) return; -+ - while (cur != NULL) { - next = cur->next; - xmlTextReaderFreeProp(reader, cur); -@@ -340,7 +343,10 @@ xmlTextReaderFreeNodeList(xmlTextReaderPtr reader, xmlNodePtr cur) { - xmlNodePtr next; - xmlDictPtr dict; - -- dict = reader->ctxt->dict; -+ if ((reader != NULL) && (reader->ctxt != NULL)) -+ dict = reader->ctxt->dict; -+ else -+ dict = NULL; - if (cur == NULL) return; - if (cur->type == XML_NAMESPACE_DECL) { - xmlFreeNsList((xmlNsPtr) cur); -@@ -417,7 +423,10 @@ static void - xmlTextReaderFreeNode(xmlTextReaderPtr reader, xmlNodePtr cur) { - xmlDictPtr dict; - -- dict = reader->ctxt->dict; -+ if ((reader != NULL) && (reader->ctxt != NULL)) -+ dict = reader->ctxt->dict; -+ else -+ dict = NULL; - if (cur->type == XML_DTD_NODE) { - xmlFreeDtd((xmlDtdPtr) cur); - return; -- cgit v1.2.3