From: Simon McVittie Date: Tue, 4 Jul 2017 16:04:16 +0000 (+0100) Subject: _dbus_marshal_validate_test: Uncomment commented-out test coverage X-Git-Tag: dbus-1.11.16~20 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f45c018cb3c4d6cba841bec4ce3de18779eb6e59;p=thirdparty%2Fdbus.git _dbus_marshal_validate_test: Uncomment commented-out test coverage This was added around 12½ years ago, in a commented-out state, and has remained commented out ever since. It turns out these test vectors do pass, although perhaps they didn't at the time. Signed-off-by: Simon McVittie Reviewed-by: Philip Withnall Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101568 --- diff --git a/dbus/dbus-marshal-validate-util.c b/dbus/dbus-marshal-validate-util.c index 79671a4f7..9e75a7e77 100644 --- a/dbus/dbus-marshal-validate-util.c +++ b/dbus/dbus-marshal-validate-util.c @@ -103,10 +103,9 @@ static const ValidityTest signature_tests[] = { { ".", DBUS_INVALID_UNKNOWN_TYPECODE }, /* https://bugs.freedesktop.org/show_bug.cgi?id=17803 */ { "a{(ii)i}", DBUS_INVALID_DICT_KEY_MUST_BE_BASIC_TYPE }, - - /* { "a{i}", DBUS_INVALID_DICT_ENTRY_HAS_ONLY_ONE_FIELD }, */ - /* { "{is}", DBUS_INVALID_DICT_ENTRY_NOT_INSIDE_ARRAY }, */ - /* { "a{isi}", DBUS_INVALID_DICT_ENTRY_HAS_TOO_MANY_FIELDS }, */ + { "a{i}", DBUS_INVALID_DICT_ENTRY_HAS_ONLY_ONE_FIELD }, + { "{is}", DBUS_INVALID_DICT_ENTRY_NOT_INSIDE_ARRAY }, + { "a{isi}", DBUS_INVALID_DICT_ENTRY_HAS_TOO_MANY_FIELDS }, }; dbus_bool_t