]> granicus.if.org Git - php/commitdiff
fixed IS_REFERENCE handling
authorXinchen Hui <laruence@gmail.com>
Tue, 2 Aug 2016 03:04:52 +0000 (11:04 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 2 Aug 2016 03:05:51 +0000 (11:05 +0800)
ext/standard/array.c

index 2680ac6bcf9dc69dace058dcd4ffbd76991de57e..949abb2457e11b8b7ff82b68f8525dce306e98fb 100644 (file)
@@ -3012,7 +3012,7 @@ PHP_FUNCTION(array_slice)
                                        break;
                                }
                                ZEND_HASH_FILL_ADD(entry);
-                               Z_TRY_ADDREF_P(entry);
+                               zval_add_ref(entry);
                        } ZEND_HASH_FOREACH_END();
                } ZEND_HASH_FILL_END();
        } else {
@@ -3034,7 +3034,7 @@ PHP_FUNCTION(array_slice)
                                        entry = zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), entry);
                                }
                        }
-                       Z_TRY_ADDREF_P(entry);
+                       zval_add_ref(entry);
                } ZEND_HASH_FOREACH_END();
        }
 }
@@ -3658,7 +3658,7 @@ PHP_FUNCTION(array_reverse)
                ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) {
                        ZEND_HASH_REVERSE_FOREACH_VAL(Z_ARRVAL_P(input), entry) {
                                ZEND_HASH_FILL_ADD(entry);
-                               Z_TRY_ADDREF_P(entry);
+                               zval_add_ref(entry);
                        } ZEND_HASH_FOREACH_END();
                } ZEND_HASH_FILL_END();
        } else {
@@ -3672,7 +3672,7 @@ PHP_FUNCTION(array_reverse)
                                        entry = zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), entry);
                                }
                        }
-                       Z_TRY_ADDREF_P(entry);
+                       zval_add_ref(entry);
                } ZEND_HASH_FOREACH_END();
        }
 }