diff options
| author | Zeev Suraski <zeev@php.net> | 2001-07-31 02:59:44 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-07-31 02:59:44 +0000 |
| commit | e629be7b5b9546ba5ce15accc6978a2dddb2e5a4 (patch) | |
| tree | be4737da55844260cb6275a2508c12d6f403e1bc | |
| parent | 3f8c890cee78e0037f058f86c73a14dfc467a10b (diff) | |
| download | php-git-e629be7b5b9546ba5ce15accc6978a2dddb2e5a4.tar.gz | |
Fix a crash bug in assert
| -rw-r--r-- | ext/standard/assert.c | 13 |
1 files changed, 7 insertions, 6 deletions
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; } |