diff options
| author | Anatol Belski <ab@php.net> | 2014-12-23 17:02:45 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-23 17:09:13 +0100 |
| commit | e2e5ed06d1e6a7cc0c7148ada9768a0c0aa16313 (patch) | |
| tree | e3c99b48c9c45cb0d42405b5cdd33e713e147350 | |
| parent | 106b1017d44580a37a191378f6cb03374b942807 (diff) | |
| download | php-git-e2e5ed06d1e6a7cc0c7148ada9768a0c0aa16313.tar.gz | |
fix NULL deref when the script encoding wasn't previously set
| -rw-r--r-- | Zend/zend.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index ad05f3b5dd..6913d51193 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -89,7 +89,7 @@ static ZEND_INI_MH(OnUpdateGCEnabled) /* {{{ */ static ZEND_INI_MH(OnUpdateScriptEncoding) /* {{{ */ { - if (!CG(multibyte)) { + if (!CG(multibyte) || !new_value) { return FAILURE; } if (!zend_multibyte_get_functions()) { |