Re: [PHP-DEV] [PATCH] Fix for bug #31440 (GLOBALS can be by G/P/C when register_globals=On)

[Ilia Alshanetsky]

Here is a slightly shorter solution to the problem, which hopefully will 
prove to be a little bit faster as well.

Ilia
Index: main/main.c
===================================================================
RCS file: /repository/php-src/main/main.c,v
retrieving revision 1.512.2.58
diff -u -a -r1.512.2.58 main.c
--- main/main.c 9 Jan 2005 16:30:22 -0000       1.512.2.58
+++ main/main.c 16 Feb 2005 04:30:15 -0000
@@ -1342,6 +1342,7 @@
        ulong             num_key;
        HashPosition      pos;
        int               key_type;
+       int               globals_check = (PG(register_globals) && (dest == 
(&EG(symbol_table))));
 
        zend_hash_internal_pointer_reset_ex(src, &pos);
        while (zend_hash_get_current_data_ex(src, (void **)&src_entry, &pos) == 
SUCCESS) {
@@ -1352,7 +1353,12 @@
                                || Z_TYPE_PP(dest_entry) != IS_ARRAY) {
                        (*src_entry)->refcount++;
                        if (key_type == HASH_KEY_IS_STRING) {
-                               zend_hash_update(dest, string_key, 
strlen(string_key)+1, src_entry, sizeof(zval *), NULL);
+                               /* if register_globals is on and working with 
main symbol table, prevent overwriting of GLOBALS */
+                               if (!globals_check || memcmp(string_key, 
"GLOBALS", sizeof("GLOBALS") - 1)) {
+                                       zend_hash_update(dest, string_key, 
strlen(string_key)+1, src_entry, sizeof(zval *), NULL);
+                               } else {
+                                       (*src_entry)->refcount--;
+                               }
                        } else {
                                zend_hash_index_update(dest, num_key, 
src_entry, sizeof(zval *), NULL);
                        }
-- 
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php