Skip to content

nanodbc: wvarchar: make sure to not read past pdata_ end #1012

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

Open
detule wants to merge 1 commit into
base: main
Choose a base branch
from
Open

nanodbc: wvarchar: make sure to not read past pdata_ end #1012

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions src/nanodbc/nanodbc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4082,8 +4082,11 @@ inline void result::result_impl::get_ref_impl<string_type>(short column, string_
// Type is unicode in the database, convert if necessary
const SQLWCHAR* s =
reinterpret_cast<SQLWCHAR*>(col.pdata_ + rowset_position_ * col.clen_);
const string_type::size_type str_size =
col.cbdata_[rowset_position_] / sizeof(SQLWCHAR);
// Defensive programming: clamp so we never read past pdata_.
// See #1011 / Snowflake for SQLTables REMARKS
const string_type::size_type str_size = std::min<string_type::size_type>(
col.cbdata_[rowset_position_] / sizeof(SQLWCHAR),
col.clen_ / sizeof(SQLWCHAR));
wide_string_type temp(s, s + str_size);
convert(temp, result);
}
Expand Down
Loading