From: Thies C. Arntzen <thies@php.net>
Date: Mon, 23 Jul 2001 16:13:34 +0000 (+0000)
Subject: fix newly introduced mem-leak in assert-module
X-Git-Tag: PRE_TSRM_MERGE_PATCH~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b660a9f55333665c25763e62a021592e4009c9d6;p=php

fix newly introduced mem-leak in assert-module
---

diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index b79e169f71..9c0f595a57 100644
--- 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 aaec3beb1e..80467d8fcd 100644
--- 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