From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 21 Feb 2014 13:38:12 +0000 (+0400)
Subject: Fixed array_unshift()
X-Git-Tag: POST_PHPNG_MERGE~412^2~603
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0eccdeea11da3936a4f1fad5a592226789dfba2;p=php

Fixed array_unshift()
---

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 502d15ea3a..f16cc40969 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 {