fix newly introduced mem-leak in assert-module

diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index b79e169f71be095a98b8610b84eb50d0d7eaa493..9c0f595a5736fdd751b096f6f3004be2bccad11f 100644 (file)
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -65,7 +65,7 @@ static PHP_INI_MH(OnChangeCallback)
        ASSERTLS_FETCH();
                 
        if (ASSERT(callback)) {
-               zval_dtor(ASSERT(callback));
+               zval_ptr_dtor(&ASSERT(callback));
        } else {
                MAKE_STD_ZVAL(ASSERT(callback));
        }
@@ -111,6 +111,15 @@ PHP_MINIT_FUNCTION(assert)
        return SUCCESS;
 }
 
+PHP_MSHUTDOWN_FUNCTION(assert)
+{
+       ASSERTLS_FETCH();
+
+       if (ASSERT(callback)) {
+               zval_ptr_dtor(&ASSERT(callback));
+       }
+}
+
 PHP_RSHUTDOWN_FUNCTION(assert)
 {
        ASSERTLS_FETCH();

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index aaec3beb1ef2b458cafc1048dbf6b6118b01f783..80467d8fcd8d56aa44974ba981928f7695fdafcb 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -822,6 +822,7 @@ PHP_MSHUTDOWN_FUNCTION(basic)
        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