[oe] [PATCH] libxml: Deleted patch that is already applied in source tarball

Joel A Fernandes agnel.joel at gmail.com
Wed Jul 6 22:11:45 UTC 2011


This deletes a patch that appears to be already applied to the checked out source and is causing do_patch in libxml2
to fail when bitbaking beagleboard-validation-base-image

Signed-off-by: Joel A Fernandes <agnel.joel at gmail.com>
---
Not sure if should bump the PR in this case? If not, please ignore this note

 .../0cbeb50ee03ce582a0c979c70d8fbf030e270c37.patch |   29 --------------------
 recipes/libxml/libxml2_2.7.8.bb                    |    1 -
 2 files changed, 0 insertions(+), 30 deletions(-)
 delete mode 100644 recipes/libxml/libxml2-2.7.8/0cbeb50ee03ce582a0c979c70d8fbf030e270c37.patch

diff --git a/recipes/libxml/libxml2-2.7.8/0cbeb50ee03ce582a0c979c70d8fbf030e270c37.patch b/recipes/libxml/libxml2-2.7.8/0cbeb50ee03ce582a0c979c70d8fbf030e270c37.patch
deleted file mode 100644
index f94350d..0000000
--- a/recipes/libxml/libxml2-2.7.8/0cbeb50ee03ce582a0c979c70d8fbf030e270c37.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0cbeb50ee03ce582a0c979c70d8fbf030e270c37 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard at 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
diff --git a/recipes/libxml/libxml2_2.7.8.bb b/recipes/libxml/libxml2_2.7.8.bb
index 1a71c2b..7d0c451 100644
--- a/recipes/libxml/libxml2_2.7.8.bb
+++ b/recipes/libxml/libxml2_2.7.8.bb
@@ -1,7 +1,6 @@
 require libxml2.inc
 
 SRC_URI += "\
-  file://0cbeb50ee03ce582a0c979c70d8fbf030e270c37.patch \
   file://df83c17e5a2646bd923f75e5e507bc80d73c9722.patch \
   file://fec31bcd452e77c10579467ca87a785b41115de6.patch \
   file://00819877651b87842ed878898ba17dba489820f0.patch \
-- 
1.7.0.4





More information about the Openembedded-devel mailing list