[PHP-CVS] cvs: php-src /ext/dom xpath.c

[Christian Stocker]

chregu          Mon Jan 19 16:08:30 2004 EDT

  Modified files:              
    /php-src/ext/dom    xpath.c 
  Log:
  Fix leaks in dom_xpath_query (create retval only if requiered) by Pierre-Alain
  
  
  
http://cvs.php.net/diff.php/php-src/ext/dom/xpath.c?r1=1.11&r2=1.12&ty=u
Index: php-src/ext/dom/xpath.c
diff -u php-src/ext/dom/xpath.c:1.11 php-src/ext/dom/xpath.c:1.12
--- php-src/ext/dom/xpath.c:1.11        Sat Jan 10 06:50:25 2004
+++ php-src/ext/dom/xpath.c     Mon Jan 19 16:08:29 2004
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: xpath.c,v 1.11 2004/01/10 11:50:25 rrichards Exp $ */
+/* $Id: xpath.c,v 1.12 2004/01/19 21:08:29 chregu Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -211,8 +211,6 @@
                RETURN_FALSE;
        }
 
-       MAKE_STD_ZVAL(retval);
-       array_init(retval);
 
        if (xpathobjp->type ==  XPATH_NODESET) {
                int i;
@@ -223,6 +221,9 @@
                        RETURN_FALSE;
                }
 
+               MAKE_STD_ZVAL(retval);
+               array_init(retval);
+
                for (i = 0; i < nodesetp->nodeNr; i++) {
                        xmlNodePtr node = nodesetp->nodeTab[i];
                        zval *child;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php