Merge branch 'PHP-8.4' into PHP-8.5

ndossche · ndossche · commit 576d61493b37 · 2025-12-28T13:04:34.000+01:00
* PHP-8.4: Fix GH-19961: Static analysis arrayIndexThenCheck warning in firebird (#20790)
diff --git a/ext/pdo_firebird/firebird_driver.c b/ext/pdo_firebird/firebird_driver.c
@@ -758,7 +758,7 @@ static zend_long firebird_handle_doer(pdo_dbh_t *dbh, const zend_string *sql) /*
 			ret = -1;
 			goto free_statement;
 		}
-		while (result[i] != isc_info_end && i < result_size) {
+		while (i < result_size && result[i] != isc_info_end) {
 			short len = (short)isc_vax_integer(&result[i+1],2);
 			/* bail out on bad len */
 			if (len != 1 && len != 2 && len != 4) {

Original file line number	Diff line number	Diff line change
`@@ -758,7 +758,7 @@ static zend_long firebird_handle_doer(pdo_dbh_t dbh, const zend_string sql) /*`
`758`	`758`	`ret = -1;`
`759`	`759`	`goto free_statement;`
`760`	`760`	`}`
`761`		`- while (result[i] != isc_info_end && i < result_size) {`
	`761`	`+ while (i < result_size && result[i] != isc_info_end) {`
`762`	`762`	`short len = (short)isc_vax_integer(&result[i+1],2);`
`763`	`763`	`/* bail out on bad len */`
`764`	`764`	`if (len != 1 && len != 2 && len != 4) {`