Merge branch 'PHP-8.4' into PHP-8.5

ndossche · ndossche · commit 4f9a39ea78eb · 2025-12-28T13:09:13.000+01:00
* PHP-8.4: Fix phpGH-19962: arrayIndexThenCheck static analysis warning in firebird
diff --git a/ext/pdo_firebird/firebird_statement.c b/ext/pdo_firebird/firebird_statement.c
@@ -235,7 +235,7 @@ static int pdo_firebird_stmt_execute(pdo_stmt_t *stmt) /* {{{ */
 					if (result_size > sizeof(result)) {
 						goto error;
 					}
-					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);
 						if (len != 1 && len != 2 && len != 4) {
 							goto error;

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ static int pdo_firebird_stmt_execute(pdo_stmt_t stmt) / {{{ */`
`235`	`235`	`if (result_size > sizeof(result)) {`
`236`	`236`	`goto error;`
`237`	`237`	`}`
`238`		`- while (result[i] != isc_info_end && i < result_size) {`
	`238`	`+ while (i < result_size && result[i] != isc_info_end) {`
`239`	`239`	`short len = (short) isc_vax_integer(&result[i + 1], 2);`
`240`	`240`	`if (len != 1 && len != 2 && len != 4) {`
`241`	`241`	`goto error;`