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 2961ff4a09f8d74528928996598b4de98c9bd70f..977407fea504efd33270c02c667c1ca112a7b302 100644 (file)
--- 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;