Merged pull request xdebug#1001

Author: derickr

src/lib/lib.c

@@ -342,19 +342,19 @@ const char *xdebug_lib_find_in_globals(const char *element, const char **found_i
 
 	/* Elements in Superglobal Symbols */
 	st = zend_hash_str_find_deref(&EG(symbol_table), "_GET", strlen("_GET"));
-	if (st && (trigger_val = zend_hash_str_find_deref(Z_ARRVAL_P(st), element, strlen(element))) != NULL) {
+	if (st && Z_TYPE_P(st) == IS_ARRAY && (trigger_val = zend_hash_str_find_deref(Z_ARRVAL_P(st), element, strlen(element))) != NULL) {
 		*found_in_global = "GET";
 		return Z_STRVAL_P(trigger_val);
 	}
 
 	st = zend_hash_str_find_deref(&EG(symbol_table), "_POST", strlen("_POST"));
-	if (st && (trigger_val = zend_hash_str_find_deref(Z_ARRVAL_P(st), element, strlen(element))) != NULL) {
+	if (st && Z_TYPE_P(st) == IS_ARRAY && (trigger_val = zend_hash_str_find_deref(Z_ARRVAL_P(st), element, strlen(element))) != NULL) {
 		*found_in_global = "POST";
 		return Z_STRVAL_P(trigger_val);
 	}
 
 	st = zend_hash_str_find_deref(&EG(symbol_table), "_COOKIE", strlen("_COOKIE"));
-	if (st && (trigger_val = zend_hash_str_find_deref(Z_ARRVAL_P(st), element, strlen(element))) != NULL) {
+	if (st && Z_TYPE_P(st) == IS_ARRAY && (trigger_val = zend_hash_str_find_deref(Z_ARRVAL_P(st), element, strlen(element))) != NULL) {
 		*found_in_global = "COOKIE";
 		return Z_STRVAL_P(trigger_val);
 	}
@@ -382,7 +382,7 @@ const char *xdebug_lib_find_in_globals(const char *element, const char **found_i
 	}
 
 	st = zend_hash_str_find_deref(&EG(symbol_table), "_ENV", strlen("_ENV"));
-	if (st && (trigger_val = zend_hash_str_find_deref(Z_ARRVAL_P(st), element, strlen(element))) != NULL) {
+	if (st && Z_TYPE_P(st) == IS_ARRAY && (trigger_val = zend_hash_str_find_deref(Z_ARRVAL_P(st), element, strlen(element))) != NULL) {
 		*found_in_global = "ENV";
 		return Z_STRVAL_P(trigger_val);
 	}

tests/base/bug02321-001.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Test for bug #2321: Seg fault when null is assigned to $_POST
+--INI--
+xdebug.mode=develop,trace
+--FILE--
+<?php
+echo "bla";
+$_POST = NULL;
+
+set_exception_handler(static function () {
+echo '1';
+});
+
+require_once '_non_existing_file';
+?>
+--EXPECTF--
+bla
+Warning: require_once(_non_existing_file): Failed to open stream: No such file or directory in %sbug02321-001.php on line %d
+%A
+1

tests/base/bug02321-002.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Test for bug #2321: Seg fault when null is assigned to $_GET
+--INI--
+xdebug.mode=develop,trace
+--FILE--
+<?php
+echo "bla";
+$_GET = NULL;
+
+set_exception_handler(static function () {
+echo '1';
+});
+
+require_once '_non_existing_file';
+?>
+--EXPECTF--
+bla
+Warning: require_once(_non_existing_file): Failed to open stream: No such file or directory in %sbug02321-002.php on line %d
+%A
+1

tests/base/bug02321-003.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Test for bug #2321: Seg fault when null is assigned to $_COOKIE
+--INI--
+xdebug.mode=develop,trace
+--FILE--
+<?php
+echo "bla";
+$_COOKIE = NULL;
+
+set_exception_handler(static function () {
+echo '1';
+});
+
+require_once '_non_existing_file';
+?>
+--EXPECTF--
+bla
+Warning: require_once(_non_existing_file): Failed to open stream: No such file or directory in %sbug02321-003.php on line %d
+%A
+1

tests/base/bug02321-004.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Test for bug #2321: Seg fault when null is assigned to $_ENV
+--INI--
+xdebug.mode=develop,trace
+--FILE--
+<?php
+echo "bla";
+$_ENV = NULL;
+
+set_exception_handler(static function () {
+echo '1';
+});
+
+require_once '_non_existing_file';
+?>
+--EXPECTF--
+bla
+Warning: require_once(_non_existing_file): Failed to open stream: No such file or directory in %sbug02321-004.php on line %d
+%A
+1