com php-src: Fixed array_unshift(): ext/standard/arra y.c

From: Date: Fri, 21 Feb 2014 13:38:12 +0000
Subject: com php-src: Fixed array_unshift(): ext/standard/arra y.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-78006@lists.php.net to get a copy of this message
Commit: d0eccdeea11da3936a4f1fad5a592226789dfba2 Author: Dmitry Stogov <dmitry@zend.com> Fri, 21 Feb 2014 17:38:12 +0400 Parents: 0907a1b3f8540f7126dfca2d15a6d3c5e8acc8ba Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d0eccdeea11da3936a4f1fad5a592226789dfba2 Log: Fixed array_unshift() Changed paths: M ext/standard/array.c Diff: diff --git a/ext/standard/array.c b/ext/standard/array.c index 502d15e..f16cc40 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -1861,7 +1861,7 @@ PHPAPI HashTable* php_splice(HashTable *in_hash, int offset, int length, zval *l /* ..for each one, create a new zval, copy entry into it and copy it into the output hash */ for (i = 0; i < list_count; i++) { entry = &list[i]; - Z_ADDREF_P(entry); + if (IS_REFCOUNTED(Z_TYPE_P(entry))) Z_ADDREF_P(entry); zend_hash_next_index_insert(out_hash, entry); } } @@ -1871,7 +1871,7 @@ PHPAPI HashTable* php_splice(HashTable *in_hash, int offset, int length, zval *l p = in_hash->arData + idx; if (Z_TYPE(p->val) == IS_UNDEF) continue; entry = &p->val; - Z_ADDREF_P(entry); + if (IS_REFCOUNTED(Z_TYPE_P(entry))) Z_ADDREF_P(entry); if (p->key == NULL) { zend_hash_next_index_insert(out_hash, entry); } else {

« previous php.cvs (#78006) next »