summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-marshal-validate-util.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2005-02-11 01:13:45 +0000
committerHavoc Pennington <hp@redhat.com>2005-02-11 01:13:45 +0000
commit71f3b461b371d6bf7c7bc4e92578420b78d5c0d8 (patch)
tree79ee6992bcea7df9d484feb61999b22ecf4c54ff /dbus/dbus-marshal-validate-util.c
parentdf0c6408805341f1ac673430ce6e92f352a473e6 (diff)
2005-02-10 Havoc Pennington <hp@redhat.com>
* dbus/dbus-message-factory.c (generate_special): modify test to avoid using a non-basic dict key * dbus/dbus-marshal-validate-util.c: add test for the below * doc/dbus-specification.xml: require that dict keys are a basic type * dbus/dbus-marshal-validate.c (_dbus_validate_signature_with_reason): require that dict key is a basic type
Diffstat (limited to 'dbus/dbus-marshal-validate-util.c')
-rw-r--r--dbus/dbus-marshal-validate-util.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/dbus/dbus-marshal-validate-util.c b/dbus/dbus-marshal-validate-util.c
index afaf5262..57caa7fc 100644
--- a/dbus/dbus-marshal-validate-util.c
+++ b/dbus/dbus-marshal-validate-util.c
@@ -92,7 +92,8 @@ static const ValidityTest signature_tests[] = {
{ "()i", DBUS_INVALID_STRUCT_HAS_NO_FIELDS },
{ "(a)", DBUS_INVALID_MISSING_ARRAY_ELEMENT_TYPE },
{ "a{ia}", DBUS_INVALID_MISSING_ARRAY_ELEMENT_TYPE },
- { "a{}", DBUS_INVALID_DICT_ENTRY_HAS_NO_FIELDS }
+ { "a{}", DBUS_INVALID_DICT_ENTRY_HAS_NO_FIELDS },
+ { "a{aii}", 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 }, */