Merge branch 'PHP-7.0'

* PHP-7.0: Fixed bug #71063 (filter_input(INPUT_ENV, ..) does not work)
laumin · Dec 8, 2015 · 2ff2ef3 · 2ff2ef3
2 parents 2cc2396 + 3427c12
commit 2ff2ef3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/ext/filter/filter.c b/ext/filter/filter.c
@@ -546,7 +546,7 @@ static zval *php_filter_get_storage(zend_long arg)/* {{{ */
 			if (PG(auto_globals_jit)) {
 				zend_is_auto_global_str(ZEND_STRL("_ENV"));
 			}
-			array_ptr = &IF_G(env_array) ? &IF_G(env_array) : &PG(http_globals)[TRACK_VARS_ENV];
+			array_ptr = !Z_ISUNDEF(IF_G(env_array)) ? &IF_G(env_array) : &PG(http_globals)[TRACK_VARS_ENV];
 			break;
 		case PARSE_SESSION:
 			/* FIXME: Implement session source */

diff --git a/ext/filter/tests/bug71063.phpt b/ext/filter/tests/bug71063.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Bug #71063 filter_input(INPUT_ENV, ..) does not work
+--SKIPIF--
+<?php if (!extension_loaded("filter")) die("skip"); ?>
+--FILE--
+<?php
+var_dump(count($_ENV['PATH']) > 0);
+var_dump(count(filter_input(INPUT_ENV, 'PATH')) > 0);
+?>
+--EXPECT--
+bool(true)
+bool(true)