diff options
| author | Heinrich Fink <hfink@toolsonair.com> | 2016-05-11 17:10:10 +0200 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2017-03-18 19:01:27 +0000 |
| commit | a15dcc4a1be7daa55aed6153a81abc9a49d0f348 (patch) | |
| tree | 61ce92a47f931a4eccf2fe4a361afdd0db7ea616 /json-glib/json-utils.c | |
| parent | abf36db8113aba96b3be2d11eaffcb51e5ccccb7 (diff) | |
| download | json-glib-a15dcc4a1be7daa55aed6153a81abc9a49d0f348.tar.gz | |
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
Diffstat (limited to 'json-glib/json-utils.c')
| -rw-r--r-- | json-glib/json-utils.c | 1 |
1 files changed, 0 insertions, 1 deletions
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)) { |