diff options
| author | Steve Wills <swills@FreeBSD.org> | 2017-12-13 14:48:17 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2017-12-13 14:48:17 +0000 |
| commit | fa39da71b57cc08c21389d5aa439358beccf6197 (patch) | |
| tree | 61a33aea574e3e0e4c9d2c6e80dee28a47ae3174 | |
| parent | c323f30a7c3e1fdafd28a389146836091a3ca7a5 (diff) | |
| download | ports-fa39da71b57cc08c21389d5aa439358beccf6197.tar.gz ports-fa39da71b57cc08c21389d5aa439358beccf6197.zip | |
MFH: r456210
textproc/libxml2: update to 2.9.7
PR: 222893
PR: 224189
Reported by: Walter Hop <walter@lifeforms.nl>
Approved by: gnome@ (kwm)
Exp-run by: antoine
Security: 76e59f55-4f7a-4887-bcb0-11604004163a
Approved by: ports-secteam (implicit)
Notes
Notes:
svn path=/branches/2017Q4/; revision=456211
| -rw-r--r-- | textproc/libxml2/Makefile | 2 | ||||
| -rw-r--r-- | textproc/libxml2/distinfo | 6 | ||||
| -rw-r--r-- | textproc/libxml2/files/patch-d8083bf | 57 |
3 files changed, 4 insertions, 61 deletions
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index 0d9774900361..a8cd9d82be73 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libxml2 -PORTVERSION= 2.9.4 +PORTVERSION= 2.9.7 PORTREVISION?= 0 CATEGORIES?= textproc gnome MASTER_SITES= ftp://xmlsoft.org/libxml2/ \ diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo index ac9828a22d42..a250779d7214 100644 --- a/textproc/libxml2/distinfo +++ b/textproc/libxml2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1472161994 -SHA256 (gnome2/libxml2-2.9.4.tar.gz) = ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c -SIZE (gnome2/libxml2-2.9.4.tar.gz) = 5374830 +TIMESTAMP = 1512750289 +SHA256 (gnome2/libxml2-2.9.7.tar.gz) = f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c +SIZE (gnome2/libxml2-2.9.7.tar.gz) = 5467389 diff --git a/textproc/libxml2/files/patch-d8083bf b/textproc/libxml2/files/patch-d8083bf deleted file mode 100644 index 57f52f86392b..000000000000 --- a/textproc/libxml2/files/patch-d8083bf +++ /dev/null @@ -1,57 +0,0 @@ -From d8083bf77955b7879c1290f0c0a24ab8cc70f7fb Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer <wellnhofer@aevum.de> -Date: Sat, 25 Jun 2016 12:35:50 +0200 -Subject: Fix NULL pointer deref in XPointer range-to - -- Check for errors after evaluating first operand. -- Add sanity check for empty stack. - -Found with afl-fuzz. ---- - result/XPath/xptr/viderror | 4 ++++ - test/XPath/xptr/viderror | 1 + - xpath.c | 7 ++++++- - 3 files changed, 11 insertions(+), 1 deletion(-) - create mode 100644 result/XPath/xptr/viderror - create mode 100644 test/XPath/xptr/viderror - -diff --git a/result/XPath/xptr/viderror b/result/XPath/xptr/viderror -new file mode 100644 -index 0000000..d589882 ---- /dev/null -+++ result/XPath/xptr/viderror -@@ -0,0 +1,4 @@ -+ -+======================== -+Expression: xpointer(non-existing-fn()/range-to(id('chapter2'))) -+Object is empty (NULL) -diff --git a/test/XPath/xptr/viderror b/test/XPath/xptr/viderror -new file mode 100644 -index 0000000..da8c53b ---- /dev/null -+++ test/XPath/xptr/viderror -@@ -0,0 +1 @@ -+xpointer(non-existing-fn()/range-to(id('chapter2'))) -diff --git a/xpath.c b/xpath.c -index 113bce6..751665b 100644 ---- xpath.c -+++ xpath.c -@@ -14005,9 +14005,14 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) - xmlNodeSetPtr oldset; - int i, j; - -- if (op->ch1 != -1) -+ if (op->ch1 != -1) { - total += - xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); -+ CHECK_ERROR0; -+ } -+ if (ctxt->value == NULL) { -+ XP_ERROR0(XPATH_INVALID_OPERAND); -+ } - if (op->ch2 == -1) - return (total); - --- -cgit v0.12 - |