json_script: fix a segfault in the file free handler
authorFelix Fietkau <nbd@openwrt.org>
Mon, 26 May 2014 13:53:29 +0000 (15:53 +0200)
committerFelix Fietkau <nbd@openwrt.org>
Mon, 26 May 2014 13:53:29 +0000 (15:53 +0200)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
json_script.c

index 9d5e9d2bf5a4287149e00284fc8924e01ac11978..0ec7b382ad94d4bbdb64156210243513af9daf30 100644 (file)
@@ -582,12 +582,18 @@ void json_script_run(struct json_script_ctx *ctx, const char *name,
        json_script_run_file(ctx, file, vars);
 }
 
-static void __json_script_file_free(struct json_script_ctx *ctx, struct json_script_file *f)
+static void __json_script_file_free(struct json_script_file *f)
 {
        struct json_script_file *next;
 
-       for (next = f->next; f; f = next, next = f->next)
-               free(f);
+       if (!f)
+               return;
+
+       next = f->next;
+       free(f);
+
+       if (next)
+               return __json_script_file_free(next);
 }
 
 void
@@ -596,7 +602,7 @@ json_script_free(struct json_script_ctx *ctx)
        struct json_script_file *f, *next;
 
        avl_remove_all_elements(&ctx->files, f, avl, next)
-               __json_script_file_free(ctx, f);
+               __json_script_file_free(f);
 
        blob_buf_free(&ctx->buf);
 }