From: Xinchen Hui <laruence@gmail.com>
Date: Tue, 25 Feb 2014 04:09:39 +0000 (+0800)
Subject: Fixed NULL pointer dereference in ext/standard/tests/strings/setlocale_basic2.php
X-Git-Tag: POST_PHPNG_MERGE~412^2~546
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0a32353af0ba610cf1677bf74ecfeddc2aa8cd6;p=php

Fixed NULL pointer dereference in ext/standard/tests/strings/setlocale_basic2.php
---

diff --git a/ext/standard/string.c b/ext/standard/string.c
index af3c192f10..33686b74e4 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];
 		}