Skip to content

bound shift width in dyncol integer readers #5154

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: main
Choose a base branch
from
+9 −2
Open

bound shift width in dyncol integer readers #5154

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
11 changes: 9 additions & 2 deletions mysys/ma_dyncol.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,8 @@ dynamic_column_var_uint_get(uchar *data, size_t data_length,
uint length;
uchar *end= data + data_length;

for (length=0; data < end ; data++)
/* A 64-bit value needs at most 10 groups; stop before the shift reaches 64 */
for (length=0; data < end && length < 10; data++)
{
val+= (((ulonglong)((*data) & 0x7f)) << (length * 7));
length++;
Expand Down Expand Up @@ -846,6 +847,10 @@ dynamic_column_uint_read(DYNAMIC_COLUMN_VALUE *store_it_here,
ulonglong value= 0;
size_t i;

/* an unsigned value occupies at most 8 bytes; reject the rest to keep i*8 < 64 */
if (length > 8)
return ER_DYNCOL_FORMAT;

for (i= 0; i < length; i++)
value+= ((ulonglong)data[i]) << (i*8);

Expand Down Expand Up @@ -906,8 +911,10 @@ static enum enum_dyncol_func_result
dynamic_column_sint_read(DYNAMIC_COLUMN_VALUE *store_it_here,
uchar *data, size_t length)
{
enum enum_dyncol_func_result rc;
ulonglong val;
dynamic_column_uint_read(store_it_here, data, length);
if ((rc= dynamic_column_uint_read(store_it_here, data, length)))
return rc;
val= store_it_here->x.ulong_value;
if (val & 1)
val= (val >> 1) ^ 0xffffffffffffffffULL;
Expand Down
Loading