com php-src: Avoid unnecessry reallocation: Zend/zend_builtin _functions.c

From: Date: Tue, 01 Apr 2014 17:19:44 +0000
Subject: com php-src: Avoid unnecessry reallocation: Zend/zend_builtin _functions.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-77508@lists.php.net to get a copy of this message
Commit: 8ddda2f649f3b13db3f4cfc48710637c823464d1 Author: Dmitry Stogov <dmitry@zend.com> Tue, 1 Apr 2014 21:19:44 +0400 Parents: 8dedaf8512d7292c9df90bebae91362ba36e7a97 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8ddda2f649f3b13db3f4cfc48710637c823464d1 Log: Avoid unnecessry reallocation Changed paths: M Zend/zend_builtin_functions.c Diff: diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index be68653..de397b9 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1015,10 +1015,14 @@ ZEND_FUNCTION(get_object_vars) } if (zend_hash_get_current_key_ex(properties, &key, &num_index, 0, &pos) == HASH_KEY_IS_STRING) { if (zend_check_property_access(zobj, key TSRMLS_CC) == SUCCESS) { - zend_unmangle_property_name_ex(key->val, key->len, &class_name, &prop_name, (int*) &prop_len); /* Not separating references */ if (Z_REFCOUNTED_P(value)) Z_ADDREF_P(value); - add_assoc_zval_ex(return_value, prop_name, prop_len, value); + if (key->val[0] == 0) { + zend_unmangle_property_name_ex(key->val, key->len, &class_name, &prop_name, (int*) &prop_len); + zend_hash_str_update(Z_ARRVAL_P(return_value), prop_name, prop_len, value); + } else { + zend_hash_update(Z_ARRVAL_P(return_value), key, value); + } } } zend_hash_move_forward_ex(properties, &pos);

« previous php.cvs (#77508) next »