cvs: php4 /ext/standard assert.c basic_functions.c

thies Mon Jul 23 12:13:34 2001 EDT Modified files: /php4/ext/standard basic_functions.c assert.c Log: fix newly introduced mem-leak in assert-module Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.359 php4/ext/standard/basic_functions.c:1.360 --- php4/ext/standard/basic_functions.c:1.359 Sat Jul 21 10:27:54 2001 +++ php4/ext/standard/basic_functions.c Mon Jul 23 12:13:33 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.359 2001/07/21 14:27:54 zeev Exp $ */ +/* $Id: basic_functions.c,v 1.360 2001/07/23 16:13:33 thies Exp $ */ #include "php.h" #include "php_main.h" @@ -822,6 +822,7 @@ PHP_MSHUTDOWN(regex)(SHUTDOWN_FUNC_ARGS_PASSTHRU); PHP_MSHUTDOWN(browscap)(SHUTDOWN_FUNC_ARGS_PASSTHRU); PHP_MSHUTDOWN(array)(SHUTDOWN_FUNC_ARGS_PASSTHRU); + PHP_MSHUTDOWN(assert)(SHUTDOWN_FUNC_ARGS_PASSTHRU); #ifdef TRANS_SID PHP_MSHUTDOWN(url_scanner_ex)(SHUTDOWN_FUNC_ARGS_PASSTHRU); #endif Index: php4/ext/standard/assert.c diff -u php4/ext/standard/assert.c:1.33 php4/ext/standard/assert.c:1.34 --- php4/ext/standard/assert.c:1.33 Wed Jul 11 08:42:22 2001 +++ php4/ext/standard/assert.c Mon Jul 23 12:13:34 2001 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: assert.c,v 1.33 2001/07/11 12:42:22 thies Exp $ */ +/* $Id: assert.c,v 1.34 2001/07/23 16:13:34 thies Exp $ */ /* {{{ includes/startup/misc */ @@ -65,7 +65,7 @@ ASSERTLS_FETCH(); if (ASSERT(callback)) { - zval_dtor(ASSERT(callback)); + zval_ptr_dtor(&ASSERT(callback)); } else { MAKE_STD_ZVAL(ASSERT(callback)); } @@ -109,6 +109,15 @@ REGISTER_LONG_CONSTANT("ASSERT_QUIET_EVAL", ASSERT_QUIET_EVAL, CONST_CS|CONST_PERSISTENT); return SUCCESS; +} + +PHP_MSHUTDOWN_FUNCTION(assert) +{ + ASSERTLS_FETCH(); + + if (ASSERT(callback)) { + zval_ptr_dtor(&ASSERT(callback)); + } } PHP_RSHUTDOWN_FUNCTION(assert)