]> granicus.if.org Git - php/commitdiff
Proper fix for the memory leak.
authorIlia Alshanetsky <iliaa@php.net>
Mon, 28 Mar 2005 18:46:57 +0000 (18:46 +0000)
committerIlia Alshanetsky <iliaa@php.net>
Mon, 28 Mar 2005 18:46:57 +0000 (18:46 +0000)
main/php_variables.c

index 8379cfa955c26d68261d845b7ae9d4952506f60b..17a0d82592770587e06f5dc3beef1d1338ab2a69 100644 (file)
@@ -668,7 +668,7 @@ int php_hash_environment(TSRMLS_D)
        }
 
        for (i=0; i<num_track_vars; i++) {
-               if ((jit_initialization && auto_global_records[i].jit_initialization) || _gpc_flags[i]) {
+               if (jit_initialization && auto_global_records[i].jit_initialization) {
                        continue;
                }
                if (!PG(http_globals)[i]) {
@@ -684,7 +684,6 @@ int php_hash_environment(TSRMLS_D)
                }
 
                zend_hash_update(&EG(symbol_table), auto_global_records[i].name, auto_global_records[i].name_len, &PG(http_globals)[i], sizeof(zval *), NULL);
-               PG(http_globals)[i]->refcount++;
                if (PG(register_long_arrays)) {
                        zend_hash_update(&EG(symbol_table), auto_global_records[i].long_name, auto_global_records[i].long_name_len, &PG(http_globals)[i], sizeof(zval *), NULL);
                        PG(http_globals)[i]->refcount++;