Merge pull request #242 from openziti/fix-crash-on-bad-config-file

avoid crash on parse error
openziti · Feb 26, 2021 · fb902d2 · fb902d2
2 parents 84794f3 + ea69339
commit fb902d2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/library/model_support.c b/library/model_support.c
@@ -67,12 +67,12 @@ jsmntok_t* parse_tokens(jsmn_parser *parser, const char *json, size_t len, size_
         *ntok = 0;
     } else {
         *ntok = rc;
-    }
-    if (*ntok == tok_cap) {
-        toks = realloc(toks, (tok_cap + 1) * sizeof(jsmntok_t));
-    }
-    toks[*ntok].type = JSMN_UNDEFINED;
 
+        if (*ntok == tok_cap) {
+            toks = realloc(toks, (tok_cap + 1) * sizeof(jsmntok_t));
+        }
+        toks[*ntok].type = JSMN_UNDEFINED;
+    }
     return toks;
 }
 

diff --git a/library/ziti.c b/library/ziti.c
@@ -163,7 +163,7 @@ int ziti_init_opts(ziti_options *options, uv_loop_t *loop) {
     ziti_log_init(loop, ZITI_LOG_DEFAULT_LEVEL, NULL);
     metrics_init(loop, 5);
 
-    PREP(ziti);
+    PREPF(ziti, ziti_errorstr);
 
     if (options->config == NULL && (options->controller == NULL || options->tls == NULL)) {
         ZITI_LOG(ERROR, "config or controller/tls has to be set");