archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

cleanup

Browse source
This commit is contained in:
Dmitry Stogov 2014-06-03 02:43:31 +04:00
parent 0427ae08fb
commit 2bc1abe204
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Zend/zend_builtin_functions.c
View file

@ -1908,7 +1908,7 @@ ZEND_FUNCTION(get_defined_constants)
if (categorize) {
zend_constant *val;
int module_number;
zval *modules, tmp, *const_val;
zval *modules, const_val;
char **module_names;
zend_module_entry *module;
int i = 1;
@ -1943,14 +1943,8 @@ ZEND_FUNCTION(get_defined_constants)
add_assoc_zval(return_value, module_names[module_number], &modules[module_number]);
}
if (EXPECTED(!Z_COPYABLE(val->value))) {
const_val = &val->value;
} else {
ZVAL_DUP(&tmp, &val->value);
const_val = &tmp;
}
zend_hash_add_new(Z_ARRVAL(modules[module_number]), val->name, const_val);
ZVAL_DUP(&const_val, &val->value);
zend_hash_add_new(Z_ARRVAL(modules[module_number]), val->name, &const_val);
} ZEND_HASH_FOREACH_END();
efree(module_names);