Merge branch '2.0' into 2.1

2017-03-02 14:05:42 +02:00
parent 3bafcae343 075ca42482
commit 789c14197d
5 changed files with 59 additions and 13 deletions
--- a/server/modules/routing/avrorouter/avro_schema.c
+++ b/server/modules/routing/avrorouter/avro_schema.c
@ -449,6 +449,10 @@ static const char *extract_field_name(const char* ptr, char* dest, size_t size)
    while (*ptr && (isspace(*ptr) || (bt = *ptr == '`')))
    {
        ptr++;
+        if (bt)
+        {
+            break;
+        }
    }

    if (strncasecmp(ptr, "constraint", 10) == 0 || strncasecmp(ptr, "index", 5) == 0 ||
@ -481,11 +485,6 @@ static const char *extract_field_name(const char* ptr, char* dest, size_t size)
        /** Valid identifier */
        size_t bytes = ptr - start;

-        if (bt)
-        {
-            bytes--;
-        }
-
        memcpy(dest, start, bytes);
        dest[bytes] = '\0';