]> granicus.if.org Git - php/commitdiff
Fix a crash bug in assert
authorZeev Suraski <zeev@php.net>
Tue, 31 Jul 2001 02:59:44 +0000 (02:59 +0000)
committerZeev Suraski <zeev@php.net>
Tue, 31 Jul 2001 02:59:44 +0000 (02:59 +0000)
ext/standard/assert.c

index e0bb336d25d46fb9d22c0c0cc1b50324b9a40ba7..9ad53f0e20d7571ac5f90a9215cf5e72ddf89498 100644 (file)
@@ -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;
 }