diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-08-14 00:37:42 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-08-14 00:37:42 +0000 |
| commit | 64345cdd6ee17cf7faa0c28f38ed43cdcb10e66f (patch) | |
| tree | 25d9445d539b4beb9f0cac65495d361b0e70fdd8 | |
| parent | 5eb3bb00db59e51f9a388783e0c127403b8e9478 (diff) | |
| download | php-git-64345cdd6ee17cf7faa0c28f38ed43cdcb10e66f.tar.gz | |
Fixed a possible crash due to invalid handling of assert ini options.
| -rw-r--r-- | ext/standard/assert.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ext/standard/assert.c b/ext/standard/assert.c index ec0c0d6736..c01d0c6622 100644 --- a/ext/standard/assert.c +++ b/ext/standard/assert.c @@ -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; |