]> granicus.if.org Git - php/commitdiff
Fixed a possible crash due to invalid handling of assert ini options.
authorIlia Alshanetsky <iliaa@php.net>
Thu, 14 Aug 2003 00:37:42 +0000 (00:37 +0000)
committerIlia Alshanetsky <iliaa@php.net>
Thu, 14 Aug 2003 00:37:42 +0000 (00:37 +0000)
ext/standard/assert.c

index ec0c0d6736151ecd9e0d8b1c90dc65e8598474d9..c01d0c66228e01e50f83a70d326484d2136514ed 100644 (file)
@@ -56,12 +56,9 @@ static PHP_INI_MH(OnChangeCallback)
                zval_ptr_dtor(&ASSERTG(callback));
        }
 
-       MAKE_STD_ZVAL(ASSERTG(callback));
-
-       if (new_value) {
+       if (new_value && (ASSERTG(callback) || new_value_length)) {
+               MAKE_STD_ZVAL(ASSERTG(callback));
                ZVAL_STRINGL(ASSERTG(callback), new_value, new_value_length, 1);
-       } else {
-               ZVAL_EMPTY_STRING(ASSERTG(callback));
        }
 
        return SUCCESS;