File tree Expand file tree Collapse file tree 1 file changed +3
-5
lines changed Expand file tree Collapse file tree 1 file changed +3
-5
lines changed Original file line number Diff line number Diff line change @@ -4304,8 +4304,7 @@ static zend_always_inline void php_array_merge_wrapper(INTERNAL_FUNCTION_PARAMET
43044304 if (ret ) {
43054305 if (HT_IS_PACKED (Z_ARRVAL_P (ret ))) {
43064306 if (HT_IS_WITHOUT_HOLES (Z_ARRVAL_P (ret ))) {
4307- ZVAL_COPY (return_value , ret );
4308- return ;
4307+ RETURN_COPY (ret );
43094308 }
43104309 } else {
43114310 bool copy = 1 ;
@@ -4318,8 +4317,7 @@ static zend_always_inline void php_array_merge_wrapper(INTERNAL_FUNCTION_PARAMET
43184317 }
43194318 } ZEND_HASH_FOREACH_END ();
43204319 if (copy ) {
4321- ZVAL_COPY (return_value , ret );
4322- return ;
4320+ RETURN_COPY (ret );
43234321 }
43244322 }
43254323 }
@@ -4334,7 +4332,7 @@ static zend_always_inline void php_array_merge_wrapper(INTERNAL_FUNCTION_PARAMET
43344332 if (HT_IS_WITHOUT_HOLES (src ) && zend_may_modify_arg_in_place (arg )) {
43354333 dest = src ;
43364334 in_place = true;
4337- ZVAL_ARR ( return_value , dest );
4335+ RETVAL_ARR ( dest );
43384336 } else {
43394337 array_init_size (return_value , count );
43404338 dest = Z_ARRVAL_P (return_value );
You can’t perform that action at this time.
0 commit comments