From a15dcc4a1be7daa55aed6153a81abc9a49d0f348 Mon Sep 17 00:00:00 2001 From: Heinrich Fink Date: Wed, 11 May 2016 17:10:10 +0200 Subject: utils/json_from_string: Don't reset user-provided error argument In json_from_string, just pass the user-provided GError** to json_parser_load_from_data. Otherwise json_from_string will never propagate any parser errors back to the caller. https://bugzilla.gnome.org/show_bug.cgi?id=766281 --- json-glib/json-utils.c | 1 - 1 file changed, 1 deletion(-) (limited to 'json-glib/json-utils.c') diff --git a/json-glib/json-utils.c b/json-glib/json-utils.c index fc92488..2ba3690 100644 --- a/json-glib/json-utils.c +++ b/json-glib/json-utils.c @@ -55,7 +55,6 @@ json_from_string (const char *str, g_return_val_if_fail (str != NULL, NULL); - error = NULL; parser = json_parser_new (); if (!json_parser_load_from_data (parser, str, -1, error)) { -- cgit v1.2.1