From e0a32353af0ba610cf1677bf74ecfeddc2aa8cd6 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Tue, 25 Feb 2014 12:09:39 +0800 Subject: [PATCH] Fixed NULL pointer dereference in ext/standard/tests/strings/setlocale_basic2.php --- ext/standard/string.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ext/standard/string.c b/ext/standard/string.c index af3c192f10b..33686b74e43 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -4331,7 +4331,9 @@ PHP_FUNCTION(setlocale) if (!zend_hash_num_elements(Z_ARRVAL(args[0]))) { break; } - plocale = zend_hash_get_current_data(Z_ARRVAL(args[0])); + if ((plocale = zend_hash_get_current_data(Z_ARRVAL(args[0]))) == NULL) { + break; + } } else { plocale = &args[i]; }