com php-src: $argv and $argc may be IS_INDIRECT: main/php _variables.c

Commit: 348fc4d6fd00dc2826be3342a6e7e9d47bbc436a Author: Bob Weinand <bobwei9@hotmail.com> Wed, 22 Jul 2015 00:22:39 +0200 Parents: 262d32634b33d85e978a66e87f43d6d12df9e23c Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=348fc4d6fd00dc2826be3342a6e7e9d47bbc436a Log: $argv and $argc may be IS_INDIRECT Changed paths: M main/php_variables.c Diff: diff --git a/main/php_variables.c b/main/php_variables.c index 43b00d9..bcc5997 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);