svn commit: r402163 - in branches/2015Q4/textproc/libxslt: . files
Koop Mast
kwm at FreeBSD.org
Sat Nov 21 15:32:39 UTC 2015
Author: kwm
Date: Sat Nov 21 15:32:37 2015
New Revision: 402163
URL: https://svnweb.freebsd.org/changeset/ports/402163
Log:
MFH: r402101
Fix CVE-2015-7995
Obtained from: libxslt upstream
Security: ecc268f2-8fc2-11e5-918c-bcaec565249c
Approved by: portmgr (erwin@)
Added:
branches/2015Q4/textproc/libxslt/files/patch-CVE-2015-7995
- copied unchanged from r402101, head/textproc/libxslt/files/patch-CVE-2015-7995
Modified:
branches/2015Q4/textproc/libxslt/Makefile
Directory Properties:
branches/2015Q4/ (props changed)
Modified: branches/2015Q4/textproc/libxslt/Makefile
==============================================================================
--- branches/2015Q4/textproc/libxslt/Makefile Sat Nov 21 15:04:37 2015 (r402162)
+++ branches/2015Q4/textproc/libxslt/Makefile Sat Nov 21 15:32:37 2015 (r402163)
@@ -3,7 +3,7 @@
PORTNAME= libxslt
PORTVERSION= 1.1.28
-PORTREVISION?= 7
+PORTREVISION?= 8
CATEGORIES?= textproc gnome
MASTER_SITES= ftp://xmlsoft.org/libxml2/ \
http://xmlsoft.org/sources/ \
Copied: branches/2015Q4/textproc/libxslt/files/patch-CVE-2015-7995 (from r402101, head/textproc/libxslt/files/patch-CVE-2015-7995)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q4/textproc/libxslt/files/patch-CVE-2015-7995 Sat Nov 21 15:32:37 2015 (r402163, copy of r402101, head/textproc/libxslt/files/patch-CVE-2015-7995)
@@ -0,0 +1,29 @@
+From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001
+From: Daniel Veillard <veillard at redhat.com>
+Date: Thu, 29 Oct 2015 19:33:23 +0800
+Subject: Fix for type confusion in preprocessing attributes
+
+CVE-2015-7995 http://www.openwall.com/lists/oss-security/2015/10/27/10
+We need to check that the parent node is an element before dereferencing
+its namespace
+---
+ libxslt/preproc.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libxslt/preproc.c b/libxslt/preproc.c
+index 0eb80a0..7f69325 100644
+--- libxslt/preproc.c
++++ libxslt/preproc.c
+@@ -2249,7 +2249,8 @@ xsltStylePreCompute(xsltStylesheetPtr style, xmlNodePtr inst) {
+ } else if (IS_XSLT_NAME(inst, "attribute")) {
+ xmlNodePtr parent = inst->parent;
+
+- if ((parent == NULL) || (parent->ns == NULL) ||
++ if ((parent == NULL) ||
++ (parent->type != XML_ELEMENT_NODE) || (parent->ns == NULL) ||
+ ((parent->ns != inst->ns) &&
+ (!xmlStrEqual(parent->ns->href, inst->ns->href))) ||
+ (!xmlStrEqual(parent->name, BAD_CAST "attribute-set"))) {
+--
+cgit v0.11.2
+
More information about the svn-ports-all
mailing list