diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-01-17 17:26:49 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-18 11:02:44 +0000 |
commit | 3917da6e2810c27c4400621a853494c29f9fe5c6 (patch) | |
tree | 67840945c207aaee9a462867421581bc18ab3673 /meta | |
parent | 57a925dbd949e488980b02896106efd82bf47ed2 (diff) | |
download | openembedded-core-3917da6e2810c27c4400621a853494c29f9fe5c6.tar.gz |
libxslt: update to 1.1.33
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/libxslt/libxslt/fix-rvts-handling.patch | 80 | ||||
-rw-r--r-- | meta/recipes-support/libxslt/libxslt_1.1.33.bb (renamed from meta/recipes-support/libxslt/libxslt_1.1.32.bb) | 8 |
2 files changed, 3 insertions, 85 deletions
diff --git a/meta/recipes-support/libxslt/libxslt/fix-rvts-handling.patch b/meta/recipes-support/libxslt/libxslt/fix-rvts-handling.patch deleted file mode 100644 index ea3ae51e93..0000000000 --- a/meta/recipes-support/libxslt/libxslt/fix-rvts-handling.patch +++ /dev/null @@ -1,80 +0,0 @@ -libxslt-1.1.32: Fix handling of RVTs returned from nested EXSLT functions - -[No upstream tracking] -- https://bugzilla.gnome.org/show_bug.cgi?id=792580 - -Set the context variable to NULL when evaluating EXSLT functions. -Fixes potential use-after-free errors or memory leaks. - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libxslt/commit/8bd32f7753ac253a54279a0b6a88d15a57076bb0] -bug: 792580 -Signed-off-by: Andrej Valek <andrej.valek@siemens.com> - -diff --git a/libexslt/functions.c b/libexslt/functions.c -index dc794e3..8511cb0 100644 ---- a/libexslt/functions.c -+++ b/libexslt/functions.c -@@ -280,6 +280,7 @@ exsltFuncFunctionFunction (xmlXPathParserContextPtr ctxt, int nargs) { - exsltFuncFunctionData *func; - xmlNodePtr paramNode, oldInsert, fake; - int oldBase; -+ void *oldCtxtVar; - xsltStackElemPtr params = NULL, param; - xsltTransformContextPtr tctxt = xsltXPathGetTransformContext(ctxt); - int i, notSet; -@@ -418,11 +419,14 @@ exsltFuncFunctionFunction (xmlXPathParserContextPtr ctxt, int nargs) { - fake = xmlNewDocNode(tctxt->output, NULL, - (const xmlChar *)"fake", NULL); - oldInsert = tctxt->insert; -+ oldCtxtVar = tctxt->contextVariable; - tctxt->insert = fake; -+ tctxt->contextVariable = NULL; - xsltApplyOneTemplate (tctxt, tctxt->node, - func->content, NULL, NULL); - xsltLocalVariablePop(tctxt, tctxt->varsBase, -2); - tctxt->insert = oldInsert; -+ tctxt->contextVariable = oldCtxtVar; - tctxt->varsBase = oldBase; /* restore original scope */ - if (params != NULL) - xsltFreeStackElemList(params); -diff --git a/tests/docs/bug-209.xml b/tests/docs/bug-209.xml -new file mode 100644 -index 0000000..69d62f2 ---- /dev/null -+++ b/tests/docs/bug-209.xml -@@ -0,0 +1 @@ -+<doc/> -diff --git a/tests/general/bug-209.out b/tests/general/bug-209.out -new file mode 100644 -index 0000000..e829790 ---- /dev/null -+++ b/tests/general/bug-209.out -@@ -0,0 +1,2 @@ -+<?xml version="1.0"?> -+<result/> -diff --git a/tests/general/bug-209.xsl b/tests/general/bug-209.xsl -new file mode 100644 -index 0000000..fe69ac6 ---- /dev/null -+++ b/tests/general/bug-209.xsl -@@ -0,0 +1,21 @@ -+<xsl:stylesheet -+ version="1.0" -+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" -+ xmlns:func="http://exslt.org/functions" -+ extension-element-prefixes="func"> -+ -+ <xsl:template match="/"> -+ <xsl:variable name="v" select="func:a()" /> -+ <xsl:copy-of select="$v"/> -+ </xsl:template> -+ -+ <func:function name="func:a"> -+ <func:result select="func:b()" /> -+ </func:function> -+ -+ <func:function name="func:b"> -+ <func:result> -+ <result/> -+ </func:result> -+ </func:function> -+</xsl:stylesheet> diff --git a/meta/recipes-support/libxslt/libxslt_1.1.32.bb b/meta/recipes-support/libxslt/libxslt_1.1.33.bb index f0fa5e723f..0e0c10d816 100644 --- a/meta/recipes-support/libxslt/libxslt_1.1.32.bb +++ b/meta/recipes-support/libxslt/libxslt_1.1.33.bb @@ -8,12 +8,10 @@ LIC_FILES_CHKSUM = "file://Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458" SECTION = "libs" DEPENDS = "libxml2" -SRC_URI = "http://xmlsoft.org/sources/libxslt-${PV}.tar.gz \ - file://fix-rvts-handling.patch \ - " +SRC_URI = "http://xmlsoft.org/sources/libxslt-${PV}.tar.gz" -SRC_URI[md5sum] = "1fc72f98e98bf4443f1651165f3aa146" -SRC_URI[sha256sum] = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460" +SRC_URI[md5sum] = "b3bd254a03e46d58f8ad1e4559cd2c2f" +SRC_URI[sha256sum] = "8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8" UPSTREAM_CHECK_REGEX = "libxslt-(?P<pver>\d+(\.\d+)+)\.tar" |