Fix GH-22665: pdo_odbc OOB write on oversized diagnostic length#22675
Open
iliaal wants to merge 1 commit into
Open
Fix GH-22665: pdo_odbc OOB write on oversized diagnostic length#22675iliaal wants to merge 1 commit into
iliaal wants to merge 1 commit into
Conversation
NattyNarwhal
left a comment
NattyNarwhal
left a comment
Member
There was a problem hiding this comment.
This looks OK, but see the driver comment in GH-22672. I think this is easy to reproduce regardless of driver versus the other issues, so should be trivial to the SQL Server driver.
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 phpGH-22665
iliaal
force-pushed
the
fix/gh-22665-pdo-odbc-diag-oob
branch
from
b218c57 to
0ee0bae
Compare
Contributor
Author
|
Right, this one is driver-agnostic: any failing query whose diagnostic message reaches the buffer size trips it, no truncation contract needed. Switched the test to |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
pdo_odbc_error() NUL-terminates the diagnostic buffer at the length SQLGetDiagRec reports, which on a truncated message is the full untruncated length and can reach or exceed the 512-byte last_err_msg buffer, writing the terminator out of bounds into the adjacent last_error field. Clamps the index to sizeof-1; the size_t cast also covers a negative driver-reported length. Reproduces with the SQLite3 ODBC driver (reports 512) via a failing query whose long identifier lengthens the message; the test skips without that driver.
Fixes #22665