morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

busctl: fix showing array of dictionary in JSON format

Browse Source 
This partially reverts the commit 684bce3d54
and fixes the issue introduced by it.

Fixes #28711.
This commit is contained in:
Yu Watanabe
2023-08-08 11:24:22 +09:00
committed by Luca Boccassi
parent ab9617a766
commit beddf8ba29
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/busctl/busctl.c
View File

@@ -1735,12 +1735,15 @@ static int json_transform_variant(sd_bus_message *m, const char *contents, JsonV
}
static int json_transform_dict_array(sd_bus_message *m, JsonVariant **ret) {
_cleanup_(json_variant_unrefp) JsonVariant *array = NULL;
JsonVariant **elements = NULL;
size_t n_elements = 0;
int r;
assert(m);
assert(ret);
CLEANUP_ARRAY(elements, n_elements, json_variant_unref_many);
for (;;) {
const char *contents;
char type;
@@ -1757,28 +1760,31 @@ static int json_transform_dict_array(sd_bus_message *m, JsonVariant **ret) {
assert(type == 'e');
if (!GREEDY_REALLOC(elements, n_elements + 2))
return log_oom();
r = sd_bus_message_enter_container(m, type, contents);
if (r < 0)
return bus_log_parse_error(r);
r = json_transform_and_append(m, &array);
r = json_transform_one(m, elements + n_elements);
if (r < 0)
return r;
r = json_transform_and_append(m, &array);
n_elements++;
r = json_transform_one(m, elements + n_elements);
if (r < 0)
return r;
n_elements++;
r = sd_bus_message_exit_container(m);
if (r < 0)
return bus_log_parse_error(r);
}
if (!array)
return json_variant_new_array(ret, NULL, 0);
*ret = TAKE_PTR(array);
return 0;
return json_variant_new_object(ret, elements, n_elements);
}
static int json_transform_one(sd_bus_message *m, JsonVariant **ret) {