diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-06-03 02:43:31 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-06-03 02:43:31 +0400 |
| commit | 2bc1abe204dd615c87511d8f425467a4af6e345f (patch) | |
| tree | 4aaf6957e375f8730ba8f4277515ddcb0ef3cca3 | |
| parent | 0427ae08fb8dde00993277c3e7f9d98abfa159a8 (diff) | |
| download | php-git-2bc1abe204dd615c87511d8f425467a4af6e345f.tar.gz | |
cleanup
| -rw-r--r-- | Zend/zend_builtin_functions.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 1483670379..d58099418f 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -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); |