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. --- .../0046-Couple-of-Missing-Null-checks.patch | 35 ---------------------- 1 file changed, 35 deletions(-) delete mode 100644 debian/patches/0046-Couple-of-Missing-Null-checks.patch (limited to 'debian/patches/0046-Couple-of-Missing-Null-checks.patch') diff --git a/debian/patches/0046-Couple-of-Missing-Null-checks.patch b/debian/patches/0046-Couple-of-Missing-Null-checks.patch deleted file mode 100644 index c8320de..0000000 --- a/debian/patches/0046-Couple-of-Missing-Null-checks.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Gaurav Gupta -Date: Thu, 7 Aug 2014 11:19:03 +0800 -Subject: Couple of Missing Null checks - -For https://bugzilla.gnome.org/show_bug.cgi?id=734328 - -Missing Null check could cause crash, if a pointer is dereferenced. - -Found problem at two places in valid.c ---- - valid.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/valid.c b/valid.c -index 114bb72..6255b5b 100644 ---- a/valid.c -+++ b/valid.c -@@ -1798,6 +1798,7 @@ xmlCopyEnumeration(xmlEnumerationPtr cur) { - - if (cur == NULL) return(NULL); - ret = xmlCreateEnumeration((xmlChar *) cur->name); -+ if (ret == NULL) return(NULL); - - if (cur->next != NULL) ret->next = xmlCopyEnumeration(cur->next); - else ret->next = NULL; -@@ -6998,6 +6999,9 @@ xmlValidGetValidElements(xmlNode *prev, xmlNode *next, const xmlChar **names, - * Creates a dummy node and insert it into the tree - */ - test_node = xmlNewDocNode (ref_node->doc, NULL, BAD_CAST "", NULL); -+ if (test_node == NULL) -+ return(-1); -+ - test_node->parent = parent; - test_node->prev = prev; - test_node->next = next; -- cgit v1.2.3