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

Fix field name parsing

Browse Source 
The fix to field name parsing didn't properly break the loop when the
backtick character was detected.
This commit is contained in:
Markus Mäkelä
2017-03-02 13:12:45 +02:00
parent e4b4dad94a
commit e01a6a0d58
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/modules/routing/avro/avro_schema.c
View File

@ -451,6 +451,10 @@ static const char *extract_field_name(const char* ptr, char* dest, size_t size)
while (*ptr && (isspace(*ptr) || (bt = *ptr == '`'))) while (*ptr && (isspace(*ptr) || (bt = *ptr == '`')))
{ {
ptr++; ptr++;
if (bt)
{
break;
}
} }
if (strncasecmp(ptr, "constraint", 10) == 0 || strncasecmp(ptr, "index", 5) == 0 || if (strncasecmp(ptr, "constraint", 10) == 0 || strncasecmp(ptr, "index", 5) == 0 ||
@ -483,11 +487,6 @@ static const char *extract_field_name(const char* ptr, char* dest, size_t size)
/** Valid identifier */ /** Valid identifier */
size_t bytes = ptr - start; size_t bytes = ptr - start;
if (bt)
{
bytes--;
}
memcpy(dest, start, bytes); memcpy(dest, start, bytes);
dest[bytes] = '\0'; dest[bytes] = '\0';