hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix off-by-one false positive in maxavro

Browse Source 
The float and double types were calculated to exceed the internal buffer
sizes even though the buffer was of the correct size.
This commit is contained in:
Markus Mäkelä 2017-06-29 22:21:21 +03:00
parent 809dea34e0
commit 902013e4f8
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
avro/maxavro.c
View File

@ -246,12 +246,17 @@ bool maxavro_read_float(MAXAVRO_FILE* file, float *dest)
{
bool rval = false;
if (file->buffer_ptr + sizeof(*dest) < file->buffer_end)
if (file->buffer_ptr + sizeof(*dest) <= file->buffer_end)
{
memcpy(dest, file->buffer_ptr, sizeof(*dest));
file->buffer_ptr += sizeof(*dest);
rval = true;
}
else
{
ss_dassert(!true);
MXS_ERROR("Block cannot hold a value of type float");
}
return rval;
}
@ -280,12 +285,17 @@ bool maxavro_read_double(MAXAVRO_FILE* file, double *dest)
{
bool rval = false;
if (file->buffer_ptr + sizeof(*dest) < file->buffer_end)
if (file->buffer_ptr + sizeof(*dest) <= file->buffer_end)
{
memcpy(dest, file->buffer_ptr, sizeof(*dest));
file->buffer_ptr += sizeof(*dest);
rval = true;
}
else
{
ss_dassert(!true);
MXS_ERROR("Block cannot hold a value of type double");
}
return rval;
}