From e629be7b5b9546ba5ce15accc6978a2dddb2e5a4 Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Tue, 31 Jul 2001 02:59:44 +0000 Subject: Fix a crash bug in assert --- ext/standard/assert.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'ext/standard/assert.c') 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; } -- cgit v1.2.1