SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-json: make it safe to call sd_json_dispatch_full() with a NULL table

Browse Source 
This is useful for generating good errors when dispatching varlink
methods that take no parameters, as we'll still generate precise errors
in that case, taking a NULL table as equivalent as one with no
entries.
This commit is contained in:
Lennart Poettering
2025-01-10 14:03:21 +01:00
parent fa8b70f2c8
commit 14533598bd
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-json/sd-json.c
+4 -4
View File
@@ -5104,7 +5104,7 @@ _public_ int sd_json_dispatch_full(
}
m = 0;
for (const sd_json_dispatch_field *p = table; p->name; p++)
for (const sd_json_dispatch_field *p = table; p && p->name; p++)
m++;
found = newa0(bool, m);
@@ -5117,12 +5117,12 @@ _public_ int sd_json_dispatch_full(
assert_se(key = sd_json_variant_by_index(v, i));
assert_se(value = sd_json_variant_by_index(v, i+1));
for (p = table; p->name; p++)
for (p = table; p && p->name; p++)
if (p->name == POINTER_MAX ||
streq_ptr(sd_json_variant_string(key), p->name))
break;
if (p->name) { /* Found a matching entry! 🙂 */
if (p && p->name) { /* Found a matching entry! 🙂 */
sd_json_dispatch_flags_t merged_flags;
merged_flags = flags | p->flags;
@@ -5223,7 +5223,7 @@ _public_ int sd_json_dispatch_full(
}
}
for (const sd_json_dispatch_field *p = table; p->name; p++) {
for (const sd_json_dispatch_field *p = table; p && p->name; p++) {
sd_json_dispatch_flags_t merged_flags = p->flags | flags;
if ((merged_flags & SD_JSON_MANDATORY) && !found[p-table]) {
src/libsystemd/sd-varlink/sd-varlink.c
-1
View File
@@ -2755,7 +2755,6 @@ _public_ int sd_varlink_dispatch(sd_varlink *v, sd_json_variant *parameters, con
int r;
assert_return(v, -EINVAL);
assert_return(table, -EINVAL);
/* A wrapper around json_dispatch_full() that returns a nice InvalidParameter error if we hit a problem with some field. */