From 81f929d15df202cceb58f8d7711a00032b4a31c6 Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Mon, 9 Nov 2020 17:27:41 +0000 Subject: [PATCH] json-utils: Don't critical if an array contains a non-string json_array_get_string_element() raises a critical warning if the element exists but isn't a string. json_node_get_string() is more tolerant. Signed-off-by: Simon McVittie <smcv@collabora.com> --- steam-runtime-tools/json-utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/steam-runtime-tools/json-utils.c b/steam-runtime-tools/json-utils.c index 160d44582..6131c2f8f 100644 --- a/steam-runtime-tools/json-utils.c +++ b/steam-runtime-tools/json-utils.c @@ -99,7 +99,6 @@ _srt_json_object_dup_strv_member (JsonObject *json_obj, { JsonArray *array; guint length; - const gchar *element; gchar **ret = NULL; g_return_val_if_fail (json_obj != NULL, NULL); @@ -118,7 +117,8 @@ _srt_json_object_dup_strv_member (JsonObject *json_obj, for (guint i = 0; i < length; i++) { - element = json_array_get_string_element (array, i); + JsonNode *node = json_array_get_element (array, i); + const gchar *element = json_node_get_string (node); if (element == NULL) element = placeholder; -- GitLab