From fb5111db5b8f2683c9f244d68f47292318cab808 Mon Sep 17 00:00:00 2001 From: Leo Date: Fri, 1 Nov 2019 11:13:17 -0300 Subject: main/libxml2: upgrade to 2.9.10 --- main/libxml2/fix-null-pointer-dereference.patch | 36 ------------------------- 1 file changed, 36 deletions(-) delete mode 100644 main/libxml2/fix-null-pointer-dereference.patch (limited to 'main/libxml2/fix-null-pointer-dereference.patch') diff --git a/main/libxml2/fix-null-pointer-dereference.patch b/main/libxml2/fix-null-pointer-dereference.patch deleted file mode 100644 index 64e7c58f17..0000000000 --- a/main/libxml2/fix-null-pointer-dereference.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2c8dc7158a3b7b028454abcb6f162c4da28ed80b Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Mon, 25 Feb 2019 12:00:50 +0100 -Subject: [PATCH] Fix null pointer dereference in xmlTextReaderReadOuterXml - -Fix a regression caused by commit 39fbfb4f. If xmlTextReaderReadOuterXml -is called on a pristine xmlReader, the current node is NULL and must not -be dereferenced. Move the call to xmlTextReaderExpand to the start of -the function to make sure that we have a valid node. - -Fixes #43. ---- - xmlreader.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xmlreader.c b/xmlreader.c -index cd1fb5fe..b8e98287 100644 ---- a/xmlreader.c -+++ b/xmlreader.c -@@ -1759,11 +1759,11 @@ xmlTextReaderReadOuterXml(xmlTextReaderPtr reader ATTRIBUTE_UNUSED) - xmlBufferPtr buff; - xmlDocPtr doc; - -- node = reader->node; -- doc = node->doc; - if (xmlTextReaderExpand(reader) == NULL) { - return NULL; - } -+ node = reader->node; -+ doc = node->doc; - /* XXX: Why is the node copied? */ - if (node->type == XML_DTD_NODE) { - node = (xmlNodePtr) xmlCopyDtd((xmlDtdPtr) node); --- -2.18.1 - -- cgit v1.2.3