diff options
| author | Peter Korsgaard | 2012-03-14 20:35:44 +0100 |
|---|---|---|
| committer | Peter Korsgaard | 2012-03-14 20:41:24 +0100 |
| commit | 6b772b2f417112e6e12ba6a2eb05ebb8250fdc9a (patch) | |
| tree | 6300f787c91277af1d6825d0c7cf56f9c1c8f05b /package/libxml2/libxml2-5-xpath-freeing2.patch | |
| parent | gcc: bump 4.4.x version (diff) | |
| download | buildroot-6b772b2f417112e6e12ba6a2eb05ebb8250fdc9a.tar.gz buildroot-6b772b2f417112e6e12ba6a2eb05ebb8250fdc9a.tar.xz buildroot-6b772b2f417112e6e12ba6a2eb05ebb8250fdc9a.zip | |
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-5-xpath-freeing2.patch')
| -rw-r--r-- | package/libxml2/libxml2-5-xpath-freeing2.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/package/libxml2/libxml2-5-xpath-freeing2.patch b/package/libxml2/libxml2-5-xpath-freeing2.patch new file mode 100644 index 000000000..17059418b --- /dev/null +++ b/package/libxml2/libxml2-5-xpath-freeing2.patch @@ -0,0 +1,28 @@ +From fec31bcd452e77c10579467ca87a785b41115de6 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard <veillard@redhat.com> +Date: Thu, 18 Nov 2010 10:07:24 +0000 +Subject: Small fix for previous commit + +--- +diff --git a/xpath.c b/xpath.c +index 1447be5..8b56189 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -11765,13 +11765,14 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, + xmlXPathObjectPtr tmp; + /* pop the result if any */ + tmp = valuePop(ctxt); +- if (tmp != contextObj) ++ 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 |