Skip to content

check row buffer bounds in Field_new_decimal::unpack #5175

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
jmestwa-coder wants to merge 1 commit into
base: 10.11
Choose a base branch
from
+7 −2
Open

check row buffer bounds in Field_new_decimal::unpack #5175

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
9 changes: 7 additions & 2 deletions sql/field.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3799,6 +3799,13 @@ Field_new_decimal::unpack(uchar* to, const uchar *from, const uchar *from_end,
uint from_pack_len= my_decimal_get_binary_size(from_precision, from_decimal);
uint len= (param_data && (from_pack_len < length)) ?
from_pack_len : length;
/*
The conversion branch below reads from_pack_len bytes through bin2decimal
and the copy branch reads len bytes; from_pack_len >= len in every case,
so one check up front covers both.
*/
if (from + from_pack_len > from_end)
return 0; // Wrong data
if ((from_pack_len && (from_pack_len < length)) ||
(from_precision < precision) ||
(from_decimal < decimals()))
Expand All @@ -3822,8 +3829,6 @@ Field_new_decimal::unpack(uchar* to, const uchar *from, const uchar *from_end,
}
else
{
if (from + len > from_end)
return 0; // Wrong data
memcpy(to, from, len); // Sizes are the same, just copy the data.
}
return from+len;
Expand Down