From df0ce635e445d0bfe7181ac49b1f2c08696df4e1 Mon Sep 17 00:00:00 2001
From: Scott MacVicar <scottmac@php.net>
Date: Fri, 13 May 2011 05:54:34 +0000
Subject: [PATCH] Fix use after free() in XMLReader::xml()

---
 ext/xmlreader/php_xmlreader.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c
index d029f5efcad..9b9f8521690 100644
--- a/ext/xmlreader/php_xmlreader.c
+++ b/ext/xmlreader/php_xmlreader.c
@@ -1092,9 +1092,7 @@ PHP_METHOD(xmlreader, XML)
 			uri = (char *) xmlCanonicPath((const xmlChar *) resolved_path);
 		}
 		reader = xmlNewTextReader(inputbfr, uri);
-		if (uri) {
-			xmlFree(uri);
-		}
+
 		if (reader != NULL) {
 #if LIBXML_VERSION >= 20628
 			ret = xmlTextReaderSetup(reader, NULL, uri, encoding, options);
@@ -1108,11 +1106,20 @@ PHP_METHOD(xmlreader, XML)
 				}
 				intern->input = inputbfr;
 				intern->ptr = reader;
+
+				if (uri) {
+					xmlFree(uri);
+				}
+
 				return;
 			}
 		}
 	}
 
+	if (uri) {
+		xmlFree(uri);
+	}
+
 	if (inputbfr) {
 		xmlFreeParserInputBuffer(inputbfr);
 	}