]> granicus.if.org Git - php/commitdiff
broken logic fixed. I'm getting old
authorZeev Suraski <zeev@php.net>
Tue, 5 Sep 2000 20:50:41 +0000 (20:50 +0000)
committerZeev Suraski <zeev@php.net>
Tue, 5 Sep 2000 20:50:41 +0000 (20:50 +0000)
main/main.c

index 875290fc355ff4ded97d526f65a92fd85392c185..df40b5c4f8974f651ad30d631d9e7a7c8527b39c 100644 (file)
@@ -1029,13 +1029,15 @@ static int php_hash_environment(ELS_D SLS_DC PLS_DC)
        }
 
        for (i=0; i<6; i++) {
-               if (!PG(http_globals)[i] && !initialized_dummy_track_vars_array) {
-                       ALLOC_ZVAL(dummy_track_vars_array);
-                       array_init(dummy_track_vars_array);
-                       INIT_PZVAL(dummy_track_vars_array);
-                       initialized_dummy_track_vars_array = 1;
-               } else {
-                       dummy_track_vars_array->refcount++;
+               if (!PG(http_globals)[i]) {
+                       if (!initialized_dummy_track_vars_array) {
+                               ALLOC_ZVAL(dummy_track_vars_array);
+                               array_init(dummy_track_vars_array);
+                               INIT_PZVAL(dummy_track_vars_array);
+                               initialized_dummy_track_vars_array = 1;
+                       } else {
+                               dummy_track_vars_array->refcount++;
+                       }
                        PG(http_globals)[i] = dummy_track_vars_array;
                }
                zend_hash_update(&EG(symbol_table), track_vars_names[i], track_vars_names_length[i], &PG(http_globals)[i], sizeof(zval *), NULL);