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 af3c192f10bcd628aa43bb775f843a220d32aac2..33686b74e432ef451f34d1736f6b67fb9a70d5fa 100644 (file)
--- 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];
                }