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

[Nuno Lopes]

nlopess         Thu Nov  9 16:33:07 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/filter callback_filter.c 
  Log:
  fix an invalid read + invalid free()
  
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/callback_filter.c?r1=1.9.2.2&r2=1.9.2.3&diff_format=u
Index: php-src/ext/filter/callback_filter.c
diff -u php-src/ext/filter/callback_filter.c:1.9.2.2 
php-src/ext/filter/callback_filter.c:1.9.2.3
--- php-src/ext/filter/callback_filter.c:1.9.2.2        Fri Nov  3 13:53:24 2006
+++ php-src/ext/filter/callback_filter.c        Thu Nov  9 16:33:07 2006
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: callback_filter.c,v 1.9.2.2 2006/11/03 13:53:24 iliaa Exp $ */
+/* $Id: callback_filter.c,v 1.9.2.3 2006/11/09 16:33:07 nlopess Exp $ */
 
 #include "php_filter.h"
 
@@ -42,15 +42,14 @@
                if (retval_ptr != value) {
                        zval_dtor(value);
                        COPY_PZVAL_TO_ZVAL(*value, retval_ptr);
+               } else {
+                       zval_ptr_dtor(&retval_ptr);
                }
        } else {
                zval_dtor(value);
                Z_TYPE_P(value) = IS_NULL;
        }
 
-       if (retval_ptr) {
-               zval_ptr_dtor(&retval_ptr);
-       }
        efree(args);
 }
 

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