Skip to content

[pull] master from php:master#1090

Merged
pull[bot] merged 5 commits into
turkdevops:masterfrom
php:master
Jul 15, 2026
Merged

[pull] master from php:master#1090
pull[bot] merged 5 commits into
turkdevops:masterfrom
php:master

Conversation

@pull

@pull pull Bot commented Jul 15, 2026

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

iliaal and others added 5 commits July 14, 2026 16:18
pdo_odbc_error() writes the NUL terminator at
einfo->last_err_msg[errmsgsize], where errmsgsize is the diagnostic length
SQLGetDiagRec reports. On a truncated message (SQL_SUCCESS_WITH_INFO) the
driver reports the full untruncated length, which can reach or exceed the
512-byte buffer, so the terminator lands out of bounds in the adjacent
last_error field. Clamp the index to sizeof(last_err_msg) - 1; the size_t
cast also folds a negative driver-reported length into the same guard.

Fixes GH-22665
Closes GH-22675
* PHP-8.4:
  Fix GH-22665: pdo_odbc OOB write on oversized diagnostic length
* PHP-8.5:
  Fix GH-22665: pdo_odbc OOB write on oversized diagnostic length
* PHP-8.5:
  PHP-8.5 is now for PHP 8.5.10-dev
@pull pull Bot locked and limited conversation to collaborators Jul 15, 2026
@pull pull Bot added the ⤵️ pull label Jul 15, 2026
@pull pull Bot merged commit b6ebae1 into turkdevops:master Jul 15, 2026
1 of 3 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants