summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2012-02-02 17:49:00 +0000
committerJohannes Schlüter <johannes@php.net>2012-02-02 17:49:00 +0000
commitd5fe0897ee8b566c4ead5aa644a903cba023a43f (patch)
treef45d6fd2e674348b81f3c9f19bbc8fd7444da381
parent9984573a6321826cb7a7fc65485c834d1dc2287e (diff)
downloadphp-git-d5fe0897ee8b566c4ead5aa644a903cba023a43f.tar.gz
Merge r323007
"fix UMR in php_register_variable_ex, reported by Stefan Esser" (stas)
-rw-r--r--main/php_variables.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/main/php_variables.c b/main/php_variables.c
index 42c8f79c13..8dd5c140c0 100644
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -198,6 +198,9 @@ PHPAPI void php_register_variable_ex(char *var_name, zval *val, zval *track_vars
MAKE_STD_ZVAL(gpc_element);
array_init(gpc_element);
zend_symtable_update(symtable1, escaped_index, index_len + 1, &gpc_element, sizeof(zval *), (void **) &gpc_element_p);
+ } else {
+ efree(var_orig);
+ return;
}
}
if (index != escaped_index) {