From 5fa2719a7d42d6a178241de8bae7df6b95fdd3c0 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Sat, 12 May 2018 11:03:58 +0200 Subject: wsutil: fix json-glib memleaks and warning Fix memleaks and complaint when trying to load non-JSON file as JSON: "GError set over the top of a previous GError or uninitialized memory." Change-Id: If5ab04dbb757636f66130bf1f8de1a45748bf541 Fixes: v2.9.0rc0-276-g73a1e98f4e ("wsutil: use json-glib instead of jsmn if present.") Reviewed-on: https://code.wireshark.org/review/27469 Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo --- wsutil/wsjson.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wsutil/wsjson.c b/wsutil/wsjson.c index 7d5c442ecd..c19c46c179 100644 --- a/wsutil/wsjson.c +++ b/wsutil/wsjson.c @@ -29,8 +29,8 @@ gboolean wsjson_is_valid_json(const guint8* buf, const size_t len) gboolean ret = TRUE; #ifdef HAVE_JSONGLIB JsonParser *parser = json_parser_new(); - GError* error; - ret = json_parser_load_from_data(parser, buf, len, &error); + ret = json_parser_load_from_data(parser, buf, len, NULL); + g_object_unref(parser); #else /* We expect no more than 1024 tokens */ guint max_tokens = 1024; -- cgit v1.2.3