Merge branch 'PHP-8.3' into PHP-8.4

ndossche · ndossche · commit 29e04acc6fb0 · 2025-12-28T13:09:05.000+01:00
* PHP-8.3: 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
@@ -243,7 +243,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
`@@ -243,7 +243,7 @@ static int pdo_firebird_stmt_execute(pdo_stmt_t stmt) / {{{ */`
`243`	`243`	`if (result_size > sizeof(result)) {`
`244`	`244`	`goto error;`
`245`	`245`	`}`
`246`		`- while (result[i] != isc_info_end && i < result_size) {`
	`246`	`+ while (i < result_size && result[i] != isc_info_end) {`
`247`	`247`	`short len = (short) isc_vax_integer(&result[i + 1], 2);`
`248`	`248`	`if (len != 1 && len != 2 && len != 4) {`
`249`	`249`	`goto error;`