summaryrefslogtreecommitdiff
path: root/main/php_variables.c
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2015-07-22 00:22:39 +0200
committerBob Weinand <bobwei9@hotmail.com>2015-07-22 00:22:39 +0200
commit348fc4d6fd00dc2826be3342a6e7e9d47bbc436a (patch)
treef130e15dec238ce4db1aee23e1d3719a00a9c2df /main/php_variables.c
parent262d32634b33d85e978a66e87f43d6d12df9e23c (diff)
downloadphp-git-348fc4d6fd00dc2826be3342a6e7e9d47bbc436a.tar.gz
$argv and $argc may be IS_INDIRECT
Diffstat (limited to 'main/php_variables.c')
-rw-r--r--main/php_variables.c4
1 files changed, 2 insertions, 2 deletions
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);