[PHP-CVS] cvs: php-src(PHP_5_2) /ext/simplexml simplexml.c

[Nuno Lopes]

nlopess         Sun Jun 24 11:41:12 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/simplexml      simplexml.c 
  Log:
  fix memleak in sxe_prop_dim_read()
  #found by coverity
  
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.28&r2=1.151.2.22.2.29&diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.28 
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.29
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.28   Wed Jun 13 13:38:26 2007
+++ php-src/ext/simplexml/simplexml.c   Sun Jun 24 11:41:12 2007
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: simplexml.c,v 1.151.2.22.2.28 2007/06/13 13:38:26 dmitry Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.29 2007/06/24 11:41:12 nlopess Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -271,9 +271,6 @@
                name = Z_STRVAL_P(member);
        }
 
-       MAKE_STD_ZVAL(return_value);
-       ZVAL_NULL(return_value);
-
        GET_NODE(sxe, node);
 
        if (sxe->iter.type == SXE_ITER_ATTRLIST) {
@@ -294,6 +291,9 @@
                }
        }
 
+       MAKE_STD_ZVAL(return_value);
+       ZVAL_NULL(return_value);
+
        if (node) {
                if (attribs) {
                        if (Z_TYPE_P(member) != IS_LONG || sxe->iter.type == 
SXE_ITER_ATTRLIST) {
@@ -2419,7 +2419,7 @@
 {
        php_info_print_table_start();
        php_info_print_table_header(2, "Simplexml support", "enabled");
-       php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.22.2.28 $");
+       php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.22.2.29 $");
        php_info_print_table_row(2, "Schema support",
 #ifdef LIBXML_SCHEMAS_ENABLED
                "enabled");

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