components/libxml2/patches/08.CVE-2010-4494.patch
branchs11-update
changeset 2452 9dc4dfa4b04d
parent 2451 f54396da08ea
child 2454 82b8521a2f38
--- a/components/libxml2/patches/08.CVE-2010-4494.patch	Wed Dec 19 02:21:27 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
---- libxml2-2.7.6/xpath.c.orig	Mon Jun  6 11:10:14 2011
-+++ libxml2-2.7.6/xpath.c	Mon Jun  6 11:11:04 2011
-@@ -11739,11 +11739,16 @@
- 
- 	    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;
- 	    }
-