kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

textproc/libxml2: update to 2.9.7

Browse source 
PR:		222893
PR:		224189
Reported by:	Walter Hop <walter@lifeforms.nl>
Approved by:	gnome@ (kwm)
Exp-run by:	antoine
MFH:		2017Q4
Security:	76e59f55-4f7a-4887-bcb0-11604004163a
This commit is contained in:
Steve Wills 2017-12-13 14:46:44 +00:00
parent a1799de23c
commit 9440728b39
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=456210
3 changed files with 4 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
textproc/libxml2/Makefile
View file

@ -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/ \

6
textproc/libxml2/distinfo
View file

@ -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

57
textproc/libxml2/files/patch-d8083bf
View file

@ -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