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

Merge branch '2.2' into 2.3

Browse Source
This commit is contained in:
Markus Mäkelä 2019-05-28 14:17:43 +03:00
commit bef8881cab
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
avro/maxavro.c
View File

@ -144,13 +144,20 @@ char* maxavro_read_string(MAXAVRO_FILE* file, size_t* size)
if (maxavro_read_integer(file, &len))
{
key = MXS_MALLOC(len + 1);
if (key)
if (file->buffer_ptr + len < file->buffer_end)
{
memcpy(key, file->buffer_ptr, len);
key[len] = '\0';
file->buffer_ptr += len;
*size = len;
key = MXS_MALLOC(len + 1);
if (key)
{
memcpy(key, file->buffer_ptr, len);
key[len] = '\0';
file->buffer_ptr += len;
*size = len;
}
else
{
file->last_error = MAXAVRO_ERR_MEMORY;
}
}
else
{

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++)
{
if (strncasecmp(keywords[i], tok, len) == 0)
if (strncasecmp(keywords[i], tok, len) == 0 && strlen(keywords[i]) == len)
{
return true;
}