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

sd-varlink: gracefully reject arrays/maps with a null element

Browse Source 
Follow-up for 799392286e.
This commit is contained in:
Frantisek Sumsal
2026-03-22 19:37:47 +01:00
committed by Daan De Meyer
parent 494c65236b
commit 924f5a3461
2 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-varlink/sd-varlink-idl.c
+7 -2
View File
@@ -1705,7 +1705,12 @@ static int varlink_idl_validate_symbol(const sd_varlink_symbol *symbol, sd_json_
static int varlink_idl_validate_field_element_type(const sd_varlink_field *field, sd_json_variant *v) {
assert(field);
assert(v);
assert(!sd_json_variant_is_null(v));
if (sd_json_variant_is_null(v))
return varlink_idl_log(
SYNTHETIC_ERRNO(EMEDIUMTYPE),
"Field '%s' element is null, refusing.",
strna(field->name));
switch (field->field_type) {
@@ -1767,7 +1772,7 @@ static int varlink_idl_validate_field_element_type(const sd_varlink_field *field
case SD_VARLINK_ANY:
/* The any type accepts any non-null JSON value, no validation needed. (Note that null is
* already handled by the caller.) */
* already gracefully rejected at the start of this function.) */
break;
case _SD_VARLINK_FIELD_COMMENT:
src/test/test-varlink-idl.c
+38
View File
@@ -581,4 +581,42 @@ TEST(any) {
ASSERT_NULL(bad_field);
}
static SD_VARLINK_DEFINE_METHOD(
ArrayTest,
SD_VARLINK_DEFINE_INPUT(arr, SD_VARLINK_INT, SD_VARLINK_ARRAY));
static SD_VARLINK_DEFINE_METHOD(
MapTest,
SD_VARLINK_DEFINE_INPUT(m, SD_VARLINK_STRING, SD_VARLINK_MAP));
TEST(null_array_element) {
_cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL;
/* Build an array with a null element - this should be rejected gracefully, not crash */
ASSERT_OK(sd_json_buildo(&v,
SD_JSON_BUILD_PAIR("arr", SD_JSON_BUILD_ARRAY(
SD_JSON_BUILD_INTEGER(1),
SD_JSON_BUILD_NULL,
SD_JSON_BUILD_INTEGER(3)))));
const char *bad_field = NULL;
ASSERT_ERROR(varlink_idl_validate_method_call(&vl_method_ArrayTest, v, /* flags= */ 0, &bad_field), EMEDIUMTYPE);
ASSERT_STREQ(bad_field, "arr");
}
TEST(null_map_element) {
_cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL;
/* Build a map with a null value - this should be rejected gracefully, not crash */
ASSERT_OK(sd_json_buildo(&v,
SD_JSON_BUILD_PAIR("m", SD_JSON_BUILD_OBJECT(
SD_JSON_BUILD_PAIR_STRING("key1", "value1"),
SD_JSON_BUILD_PAIR_NULL("key2"),
SD_JSON_BUILD_PAIR_STRING("key3", "value3")))));
const char *bad_field = NULL;
ASSERT_ERROR(varlink_idl_validate_method_call(&vl_method_MapTest, v, /* flags= */ 0, &bad_field), EMEDIUMTYPE);
ASSERT_STREQ(bad_field, "m");
}
DEFINE_TEST_MAIN(LOG_DEBUG);