diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-03-14 20:35:44 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-03-14 20:41:24 +0100 |
| commit | 6b772b2f417112e6e12ba6a2eb05ebb8250fdc9a (patch) | |
| tree | 6300f787c91277af1d6825d0c7cf56f9c1c8f05b /package/libxml2/libxml2-4-xpath-freeing.patch | |
| parent | e687bb71a028303f326aeebfaf94a3ac1c43b4e4 (diff) | |
libxml2: ensure patches are applied in the correct order
Some of the patches depends on eachother, so rename them to ensure they
get applied in the correct order.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/libxml2/libxml2-4-xpath-freeing.patch')
| -rw-r--r-- | package/libxml2/libxml2-4-xpath-freeing.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/package/libxml2/libxml2-4-xpath-freeing.patch b/package/libxml2/libxml2-4-xpath-freeing.patch new file mode 100644 index 000000000..3509a48da --- /dev/null +++ b/package/libxml2/libxml2-4-xpath-freeing.patch @@ -0,0 +1,32 @@ +From df83c17e5a2646bd923f75e5e507bc80d73c9722 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard <veillard@redhat.com> +Date: Wed, 17 Nov 2010 13:12:14 +0000 +Subject: Fix a potential freeing error in XPath + +--- +diff --git a/xpath.c b/xpath.c +index 81e33f6..1447be5 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -11763,11 +11763,15 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, + + if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) { + xmlXPathObjectPtr tmp; +- /* pop the result */ ++ /* pop the result if any */ + tmp = valuePop(ctxt); +- xmlXPathReleaseObject(xpctxt, tmp); +- /* then pop off contextObj, which will be freed later */ +- valuePop(ctxt); ++ if (tmp != contextObj) ++ /* ++ * Free up the result ++ * then pop off contextObj, which will be freed later ++ */ ++ xmlXPathReleaseObject(xpctxt, tmp); ++ valuePop(ctxt); + goto evaluation_error; + } + +-- +cgit v0.8.3.1 |