From: Zeev Suraski <zeev@php.net>
Date: Tue, 31 Jul 2001 02:59:44 +0000 (+0000)
Subject: Fix a crash bug in assert
X-Git-Tag: PRE_ENGINE2_SPLIT~172
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e629be7b5b9546ba5ce15accc6978a2dddb2e5a4;p=php

Fix a crash bug in assert
---

diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index e0bb336d25..9ad53f0e20 100644
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -54,14 +54,15 @@ static PHP_INI_MH(OnChangeCallback)
 {
 	if (ASSERTG(callback)) {
 		zval_ptr_dtor(&ASSERTG(callback));
-	} else {
-		MAKE_STD_ZVAL(ASSERTG(callback));
 	}
 
-	if (new_value)
-		ZVAL_STRINGL(ASSERTG(callback),new_value,new_value_length,1)
-	else
-		ZVAL_EMPTY_STRING(ASSERTG(callback))
+	MAKE_STD_ZVAL(ASSERTG(callback));
+
+	if (new_value) {
+		ZVAL_STRINGL(ASSERTG(callback),new_value,new_value_length,1);
+	} else {
+		ZVAL_EMPTY_STRING(ASSERTG(callback));
+	}
 
 	return SUCCESS;
 }