[PHP-CVS] cvs: php-src /ext/standard assert.c

[Antony Dovgal]

tony2001                Tue Aug  8 17:32:19 2006 UTC

  Modified files:              
    /php-src/ext/standard       assert.c 
  Log:
  fix leak in assert()
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/assert.c?r1=1.67&r2=1.68&diff_format=u
Index: php-src/ext/standard/assert.c
diff -u php-src/ext/standard/assert.c:1.67 php-src/ext/standard/assert.c:1.68
--- php-src/ext/standard/assert.c:1.67  Wed Jul 12 22:19:12 2006
+++ php-src/ext/standard/assert.c       Tue Aug  8 17:32:19 2006
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: assert.c,v 1.67 2006/07/12 22:19:12 tony2001 Exp $ */
+/* $Id: assert.c,v 1.68 2006/08/08 17:32:19 tony2001 Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -161,6 +161,9 @@
                if (zend_eval_string(myeval, &retval, 
compiled_string_description TSRMLS_CC) == FAILURE) {
                        efree(compiled_string_description);
                        php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, 
"Failure evaluating code: %s%s", PHP_EOL, myeval);
+                       if (free_tmp) {
+                               zval_dtor(&tmp);
+                       }
                        if (ASSERTG(bail)) {
                                zend_bailout();
                        }
@@ -180,6 +183,9 @@
        }
 
        if (val) {
+               if (free_tmp) {
+                       zval_dtor(&tmp);
+               }
                RETURN_TRUE;
        }
 

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