Return early from php_search_array()

cmb69 · cmb69 · commit 8591bb70a4b2 · 2020-12-04T01:17:26.000+01:00
diff --git a/ext/standard/array.c b/ext/standard/array.c
@@ -1526,11 +1526,10 @@ static inline void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior)
 						RETURN_TRUE;
 					} else {
 						if (str_idx) {
-							RETVAL_STR_COPY(str_idx);
+							RETURN_STR_COPY(str_idx);
 						} else {
-							RETVAL_LONG(num_idx);
+							RETURN_LONG(num_idx);
 						}
-						return;
 					}
 				}
 			} ZEND_HASH_FOREACH_END();
@@ -1542,11 +1541,10 @@ static inline void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior)
 						RETURN_TRUE;
 					} else {
 						if (str_idx) {
-							RETVAL_STR_COPY(str_idx);
+							RETURN_STR_COPY(str_idx);
 						} else {
-							RETVAL_LONG(num_idx);
+							RETURN_LONG(num_idx);
 						}
-						return;
 					}
 				}
 			} ZEND_HASH_FOREACH_END();
@@ -1559,11 +1557,10 @@ static inline void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior)
 						RETURN_TRUE;
 					} else {
 						if (str_idx) {
-							RETVAL_STR_COPY(str_idx);
+							RETURN_STR_COPY(str_idx);
 						} else {
-							RETVAL_LONG(num_idx);
+							RETURN_LONG(num_idx);
 						}
-						return;
 					}
 				}
 			} ZEND_HASH_FOREACH_END();
@@ -1574,11 +1571,10 @@ static inline void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior)
 						RETURN_TRUE;
 					} else {
 						if (str_idx) {
-							RETVAL_STR_COPY(str_idx);
+							RETURN_STR_COPY(str_idx);
 						} else {
-							RETVAL_LONG(num_idx);
+							RETURN_LONG(num_idx);
 						}
-						return;
 					}
 				}
 			} ZEND_HASH_FOREACH_END();
@@ -1589,11 +1585,10 @@ static inline void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior)
 						RETURN_TRUE;
 					} else {
 						if (str_idx) {
-							RETVAL_STR_COPY(str_idx);
+							RETURN_STR_COPY(str_idx);
 						} else {
-							RETVAL_LONG(num_idx);
+							RETURN_LONG(num_idx);
 						}
-						return;
 					}
 				}
 			} ZEND_HASH_FOREACH_END();

Original file line number	Diff line number	Diff line change
`@@ -1526,11 +1526,10 @@ static inline void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior)`
`1526`	`1526`	`RETURN_TRUE;`
`1527`	`1527`	`} else {`
`1528`	`1528`	`if (str_idx) {`
`1529`		`- RETVAL_STR_COPY(str_idx);`
	`1529`	`+ RETURN_STR_COPY(str_idx);`
`1530`	`1530`	`} else {`
`1531`		`- RETVAL_LONG(num_idx);`
	`1531`	`+ RETURN_LONG(num_idx);`
`1532`	`1532`	`}`
`1533`		`- return;`
`1534`	`1533`	`}`
`1535`	`1534`	`}`
`1536`	`1535`	`} ZEND_HASH_FOREACH_END();`
`@@ -1542,11 +1541,10 @@ static inline void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior)`
`1542`	`1541`	`RETURN_TRUE;`
`1543`	`1542`	`} else {`
`1544`	`1543`	`if (str_idx) {`
`1545`		`- RETVAL_STR_COPY(str_idx);`
	`1544`	`+ RETURN_STR_COPY(str_idx);`
`1546`	`1545`	`} else {`
`1547`		`- RETVAL_LONG(num_idx);`
	`1546`	`+ RETURN_LONG(num_idx);`
`1548`	`1547`	`}`
`1549`		`- return;`
`1550`	`1548`	`}`
`1551`	`1549`	`}`
`1552`	`1550`	`} ZEND_HASH_FOREACH_END();`
`@@ -1559,11 +1557,10 @@ static inline void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior)`
`1559`	`1557`	`RETURN_TRUE;`
`1560`	`1558`	`} else {`
`1561`	`1559`	`if (str_idx) {`
`1562`		`- RETVAL_STR_COPY(str_idx);`
	`1560`	`+ RETURN_STR_COPY(str_idx);`
`1563`	`1561`	`} else {`
`1564`		`- RETVAL_LONG(num_idx);`
	`1562`	`+ RETURN_LONG(num_idx);`
`1565`	`1563`	`}`
`1566`		`- return;`
`1567`	`1564`	`}`
`1568`	`1565`	`}`
`1569`	`1566`	`} ZEND_HASH_FOREACH_END();`
`@@ -1574,11 +1571,10 @@ static inline void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior)`
`1574`	`1571`	`RETURN_TRUE;`
`1575`	`1572`	`} else {`
`1576`	`1573`	`if (str_idx) {`
`1577`		`- RETVAL_STR_COPY(str_idx);`
	`1574`	`+ RETURN_STR_COPY(str_idx);`
`1578`	`1575`	`} else {`
`1579`		`- RETVAL_LONG(num_idx);`
	`1576`	`+ RETURN_LONG(num_idx);`
`1580`	`1577`	`}`
`1581`		`- return;`
`1582`	`1578`	`}`
`1583`	`1579`	`}`
`1584`	`1580`	`} ZEND_HASH_FOREACH_END();`
`@@ -1589,11 +1585,10 @@ static inline void php_search_array(INTERNAL_FUNCTION_PARAMETERS, int behavior)`
`1589`	`1585`	`RETURN_TRUE;`
`1590`	`1586`	`} else {`
`1591`	`1587`	`if (str_idx) {`
`1592`		`- RETVAL_STR_COPY(str_idx);`
	`1588`	`+ RETURN_STR_COPY(str_idx);`
`1593`	`1589`	`} else {`
`1594`		`- RETVAL_LONG(num_idx);`
	`1590`	`+ RETURN_LONG(num_idx);`
`1595`	`1591`	`}`
`1596`		`- return;`
`1597`	`1592`	`}`
`1598`	`1593`	`}`
`1599`	`1594`	`} ZEND_HASH_FOREACH_END();`