Merge branch '2.3' into develop

2019-02-07 10:50:27 +02:00
parent 934be45b68 b560a67e54
commit 42b5c39f43
12 changed files with 85 additions and 47 deletions
--- a/server/modules/routing/avrorouter/avro_schema.cc
+++ b/server/modules/routing/avrorouter/avro_schema.cc
@ -57,7 +57,8 @@ bool json_extract_field_names(const char* filename, std::vector<Column>& columns
    bool rval = false;
    json_error_t err;
    err.text[0] = '\0';
-    json_t* obj, * arr;
+    json_t* obj;
+    json_t* arr = nullptr;

    if ((obj = json_load_file(filename, 0, &err)) && (arr = json_object_get(obj, "fields")))
    {