From: Bob Weinand <bobwei9@hotmail.com>
Date: Tue, 21 Jul 2015 22:22:39 +0000 (+0200)
Subject: $argv and $argc may be IS_INDIRECT
X-Git-Tag: php-7.0.0beta3~5^2~112
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=348fc4d6fd00dc2826be3342a6e7e9d47bbc436a;p=php

$argv and $argc may be IS_INDIRECT
---

diff --git a/main/php_variables.c b/main/php_variables.c
index 43b00d9322..bcc5997faa 100644
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -740,8 +740,8 @@ static zend_bool php_auto_globals_create_server(zend_string *name)
 			if (SG(request_info).argc) {
 				zval *argc, *argv;
 
-				if ((argc = zend_hash_str_find(&EG(symbol_table), "argc", sizeof("argc")-1)) != NULL &&
-					(argv = zend_hash_str_find(&EG(symbol_table), "argv", sizeof("argv")-1)) != NULL) {
+				if ((argc = zend_hash_str_find_ind(&EG(symbol_table), "argc", sizeof("argc")-1)) != NULL &&
+					(argv = zend_hash_str_find_ind(&EG(symbol_table), "argv", sizeof("argv")-1)) != NULL) {
 					Z_ADDREF_P(argv);
 					zend_hash_str_update(Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER]), "argv", sizeof("argv")-1, argv);
 					zend_hash_str_update(Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER]), "argc", sizeof("argc")-1, argc);