$argv and $argc may be IS_INDIRECT

diff --git a/main/php_variables.c b/main/php_variables.c
index 43b00d93224e55be14acb09cc2627e104ecd7ab8..bcc5997faa16c53130b0de1ffa178938d63517ee 100644 (file)
--- 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);