Skip to content

[pull] master from php:master #627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 8 commits into from
Dec 28, 2025
+2 −2
Merged

[pull] master from php:master #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ce534c6
Fix GH-19961: Static analysis arrayIndexThenCheck warning in firebird…
ndossche Dec 28, 2025
fa8bb98
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Dec 28, 2025
576d614
Merge branch 'PHP-8.4' into PHP-8.5
ndossche Dec 28, 2025
e6906db
Merge branch 'PHP-8.5'
ndossche Dec 28, 2025
bae78c6
Fix GH-19962: arrayIndexThenCheck static analysis warning in firebird
ndossche Dec 28, 2025
29e04ac
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Dec 28, 2025
4f9a39e
Merge branch 'PHP-8.4' into PHP-8.5
ndossche Dec 28, 2025
04bf2e5
Merge branch 'PHP-8.5'
ndossche Dec 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/pdo_firebird/firebird_driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion ext/pdo_firebird/firebird_statement.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down