Fix for bugs 13961, 39927 and 45947

diff --git a/main/php_variables.c b/main/php_variables.c
index f823e53bb80025d08f5a1f0174e99025d99443db..46aa187374fe868feb6eb35f0ad1b0f8e21f2728 100644 (file)
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -66,11 +66,12 @@ PHPAPI void php_u_register_variable_safe(UChar *var, UChar *strval, int str_len,
        php_u_register_variable_ex(var, &new_entry, track_vars_array TSRMLS_CC);
 }
 
-PHPAPI void php_register_variable_ex(char *var, zval *val, zval *track_vars_array TSRMLS_DC)
+PHPAPI void php_register_variable_ex(char *var_name, zval *val, zval *track_vars_array TSRMLS_DC)
 {
        char *p = NULL;
        char *ip;               /* index pointer */
        char *index;
+       char *var, *var_orig;
        int var_len, index_len;
        zval *gpc_element, **gpc_element_p;
        zend_bool is_array = 0;
@@ -92,6 +93,8 @@ PHPAPI void php_register_variable_ex(char *var, zval *val, zval *track_vars_arra
         * Prepare variable name
         */
 
+       var_orig = estrdup(var_name);
+       var = var_orig;
        /* ignore leading spaces in the variable name */
        while (*var && *var==' ') {
                var++;
@@ -112,6 +115,7 @@ PHPAPI void php_register_variable_ex(char *var, zval *val, zval *track_vars_arra
 
        if (var_len==0) { /* empty variable name, or variable name with a space in it */
                zval_dtor(val);
+               efree(var_orig);
                return;
        }
 
@@ -120,6 +124,7 @@ PHPAPI void php_register_variable_ex(char *var, zval *val, zval *track_vars_arra
                var_len == sizeof("GLOBALS")-1 &&
                !memcmp(var, "GLOBALS", sizeof("GLOBALS")-1)) {
                zval_dtor(val);
+               efree(var_orig);
                return;
        }
 
@@ -146,6 +151,7 @@ PHPAPI void php_register_variable_ex(char *var, zval *val, zval *track_vars_arra
                                if (!PG(display_errors)) {
                                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variable nesting level exceeded %ld. To increase the limit change max_input_nesting_level in php.ini.", PG(max_input_nesting_level));
                                }
+                               efree(var_orig);
                                return;
                        }
 
@@ -221,6 +227,7 @@ plain_var:
                        }
                }
        }
+       efree(var_orig);
 }
 
 PHPAPI void php_u_register_variable_ex(UChar *var, zval *val, zval *track_vars_array TSRMLS_DC)