From e2e5ed06d1e6a7cc0c7148ada9768a0c0aa16313 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 23 Dec 2014 17:02:45 +0100 Subject: [PATCH] fix NULL deref when the script encoding wasn't previously set --- Zend/zend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()) { -- 2.40.0