From b7df68c164f4085b60407344b8ea0f31771631c9 Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Mon, 28 Aug 2017 13:56:52 -0700 Subject: [PATCH] Remember how to keep a parse tree around after the parser is closed --- tile-join.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tile-join.cpp b/tile-join.cpp index 11e4f23b..7bd2c165 100644 --- a/tile-join.cpp +++ b/tile-join.cpp @@ -1049,8 +1049,8 @@ json_object *read_filter(const char *fname) { fprintf(stderr, "%s: %s\n", fname, jp->error); exit(EXIT_FAILURE); } - - // XXX clone tree instead of leaving pull open + json_disconnect(filter); + json_end(jp); fclose(fp); return filter; } @@ -1063,8 +1063,8 @@ json_object *parse_filter(const char *s) { fprintf(stderr, "%s\n", jp->error); exit(EXIT_FAILURE); } - - // XXX clone tree instead of leaving pull open + json_disconnect(filter); + json_end(jp); return filter; } @@ -1301,5 +1301,9 @@ int main(int argc, char **argv) { mbtiles_close(outdb, argv[0]); } + if (filter != NULL) { + json_free(filter); + } + return 0; }