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

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2019-05-28 14:40:45 +03:00
parent 006b87cebe bef8881cab
commit 65c795164c
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
avro/maxavro.cc
View File

@ -144,7 +144,9 @@ char* maxavro_read_string(MAXAVRO_FILE* file, size_t* size)
if (maxavro_read_integer(file, &len)) if (maxavro_read_integer(file, &len))
{ {
key = (char*)MXS_MALLOC(len + 1); if (file->buffer_ptr + len < file->buffer_end)
{
key = MXS_MALLOC(len + 1);
if (key) if (key)
{ {
memcpy(key, file->buffer_ptr, len); memcpy(key, file->buffer_ptr, len);
@ -157,6 +159,11 @@ char* maxavro_read_string(MAXAVRO_FILE* file, size_t* size)
file->last_error = MAXAVRO_ERR_MEMORY; file->last_error = MAXAVRO_ERR_MEMORY;
} }
} }
else
{
file->last_error = MAXAVRO_ERR_MEMORY;
}
}
return key; return key;
} }

2
server/modules/routing/avrorouter/rpl.cc
View File

@ -1120,7 +1120,7 @@ static bool token_is_keyword(const char* tok, int len)
{ {
for (int i = 0; keywords[i]; i++) for (int i = 0; keywords[i]; i++)
{ {
if (strncasecmp(keywords[i], tok, len) == 0) if (strncasecmp(keywords[i], tok, len) == 0 && strlen(keywords[i]) == len)
{ {
return true; return true;
} }