From: Christian Stocker <chregu@php.net>
Date: Mon, 19 Jan 2004 21:08:29 +0000 (+0000)
Subject: Fix leaks in dom_xpath_query (create retval only if requiered) by Pierre-Alain
X-Git-Tag: php_ibase_before_split~87
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b70f9d1b3e53d5a3f65d258ab2ac92ef050f67c;p=php

Fix leaks in dom_xpath_query (create retval only if requiered) by Pierre-Alain
---

diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c
index 2961ff4a09..977407fea5 100644
--- a/ext/dom/xpath.c
+++ b/ext/dom/xpath.c
@@ -211,8 +211,6 @@ PHP_FUNCTION(dom_xpath_query)
 		RETURN_FALSE;
 	}
 
-	MAKE_STD_ZVAL(retval);
-	array_init(retval);
 
 	if (xpathobjp->type ==  XPATH_NODESET) {
 		int i;
@@ -223,6 +221,9 @@ PHP_FUNCTION(dom_xpath_query)
 			RETURN_FALSE;
 		}
 
+		MAKE_STD_ZVAL(retval);
+		array_init(retval);
+
 		for (i = 0; i < nodesetp->nodeNr; i++) {
 			xmlNodePtr node = nodesetp->nodeTab[i];
 			zval *child;