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. --- .../0033-Adding-some-missing-NULL-checks.patch | 57 ---------------------- 1 file changed, 57 deletions(-) delete mode 100644 debian/patches/0033-Adding-some-missing-NULL-checks.patch (limited to 'debian/patches/0033-Adding-some-missing-NULL-checks.patch') diff --git a/debian/patches/0033-Adding-some-missing-NULL-checks.patch b/debian/patches/0033-Adding-some-missing-NULL-checks.patch deleted file mode 100644 index 967fa75..0000000 --- a/debian/patches/0033-Adding-some-missing-NULL-checks.patch +++ /dev/null @@ -1,57 +0,0 @@ -From: Gaurav -Date: Fri, 13 Jun 2014 14:45:20 +0800 -Subject: Adding some missing NULL checks - -in SAX2 DOM building code and in the HTML parser ---- - HTMLparser.c | 4 ++-- - SAX2.c | 9 +++++++++ - 2 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/HTMLparser.c b/HTMLparser.c -index 44c1a3c..79b1adf 100644 ---- a/HTMLparser.c -+++ b/HTMLparser.c -@@ -3671,13 +3671,13 @@ htmlParseStartTag(htmlParserCtxtPtr ctxt) { - int i; - int discardtag = 0; - -- if (ctxt->instate == XML_PARSER_EOF) -- return(-1); - if ((ctxt == NULL) || (ctxt->input == NULL)) { - htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR, - "htmlParseStartTag: context error\n", NULL, NULL); - return -1; - } -+ if (ctxt->instate == XML_PARSER_EOF) -+ return(-1); - if (CUR != '<') return -1; - NEXT; - -diff --git a/SAX2.c b/SAX2.c -index 33d167e..76b7158 100644 ---- a/SAX2.c -+++ b/SAX2.c -@@ -1177,6 +1177,12 @@ xmlSAX2AttributeInternal(void *ctx, const xmlChar *fullname, - val = xmlStringDecodeEntities(ctxt, value, XML_SUBSTITUTE_REF, - 0,0,0); - ctxt->depth--; -+ if (val == NULL) { -+ xmlSAX2ErrMemory(ctxt, "xmlSAX2StartElement"); -+ if (name != NULL) -+ xmlFree(name); -+ return; -+ } - } else { - val = (xmlChar *) value; - } -@@ -2570,6 +2576,9 @@ xmlSAX2Characters(void *ctx, const xmlChar *ch, int len) - (xmlDictOwns(ctxt->dict, lastChild->content))) { - lastChild->content = xmlStrdup(lastChild->content); - } -+ if (lastChild->content == NULL) { -+ xmlSAX2ErrMemory(ctxt, "xmlSAX2Characters: xmlStrdup returned NULL"); -+ } - if (((size_t)ctxt->nodelen + (size_t)len > XML_MAX_TEXT_LENGTH) && - ((ctxt->options & XML_PARSE_HUGE) == 0)) { - xmlSAX2ErrMemory(ctxt, "xmlSAX2Characters: huge text node"); -- cgit v1.2.3