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-2.7.8-xpath-memory.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-2.7.8-xpath-memory.patch')
| -rw-r--r-- | package/libxml2/libxml2-2.7.8-xpath-memory.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/package/libxml2/libxml2-2.7.8-xpath-memory.patch b/package/libxml2/libxml2-2.7.8-xpath-memory.patch deleted file mode 100644 index f94350d27..000000000 --- a/package/libxml2/libxml2-2.7.8-xpath-memory.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0cbeb50ee03ce582a0c979c70d8fbf030e270c37 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <veillard@redhat.com> -Date: Mon, 15 Nov 2010 11:06:29 +0000 -Subject: Fix a potential memory access error - -in case of a previus allocation error ---- -diff --git a/xpath.c b/xpath.c -index 4d6826d..81e33f6 100644 ---- a/xpath.c -+++ b/xpath.c -@@ -3575,13 +3575,13 @@ xmlXPathNodeSetAdd(xmlNodeSetPtr cur, xmlNodePtr val) { - } else if (cur->nodeNr == cur->nodeMax) { - xmlNodePtr *temp; - -- cur->nodeMax *= 2; -- temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * -+ temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 * - sizeof(xmlNodePtr)); - if (temp == NULL) { - xmlXPathErrMemory(NULL, "growing nodeset\n"); - return; - } -+ cur->nodeMax *= 2; - cur->nodeTab = temp; - } - if (val->type == XML_NAMESPACE_DECL) { --- -cgit v0.8.3.1 |