diff options
Diffstat (limited to 'textproc/libxslt/files')
-rw-r--r-- | textproc/libxslt/files/patch-CVE-2015-7995 | 29 | ||||
-rw-r--r-- | textproc/libxslt/files/patch-xsltproc_xsltproc.c | 24 |
2 files changed, 0 insertions, 53 deletions
diff --git a/textproc/libxslt/files/patch-CVE-2015-7995 b/textproc/libxslt/files/patch-CVE-2015-7995 deleted file mode 100644 index 9e83afc98b02..000000000000 --- a/textproc/libxslt/files/patch-CVE-2015-7995 +++ /dev/null @@ -1,29 +0,0 @@ -From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <veillard@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 - diff --git a/textproc/libxslt/files/patch-xsltproc_xsltproc.c b/textproc/libxslt/files/patch-xsltproc_xsltproc.c deleted file mode 100644 index 485d4213164a..000000000000 --- a/textproc/libxslt/files/patch-xsltproc_xsltproc.c +++ /dev/null @@ -1,24 +0,0 @@ -From 5af7ad745323004984287e48b42712e7305de35c Mon Sep 17 00:00:00 2001 -From: Per Hedeland <per@hedeland.org> -Date: Fri, 13 Dec 2013 14:43:06 +0100 -Subject: Make --maxvars option work - - -diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c -index b22df37..66d8cbb 100644 ---- xsltproc/xsltproc.c -+++ xsltproc/xsltproc.c -@@ -803,6 +803,10 @@ main(int argc, char **argv) - (!strcmp(argv[i], "--maxdepth"))) { - i++; - continue; -+ } else if ((!strcmp(argv[i], "-maxvars")) || -+ (!strcmp(argv[i], "--maxvars"))) { -+ i++; -+ continue; - } else if ((!strcmp(argv[i], "-maxparserdepth")) || - (!strcmp(argv[i], "--maxparserdepth"))) { - i++; --- -cgit v0.10.2 - |