From 71f3b461b371d6bf7c7bc4e92578420b78d5c0d8 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 11 Feb 2005 01:13:45 +0000 Subject: 2005-02-10 Havoc Pennington * 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 --- doc/TODO | 5 ----- doc/dbus-specification.xml | 12 +++++++----- 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'doc') diff --git a/doc/TODO b/doc/TODO index b64409a0..642d97d3 100644 --- a/doc/TODO +++ b/doc/TODO @@ -27,15 +27,10 @@ Important for 1.0 yourself; is it an error, or allowed? If allowed, we need to have a test for it in the test suite. - - add string array support back to append_args() - - validate dict entry number of fields - just before 1.0, try a HAVE_INT64=0 build and be sure it runs - - the spec and implementation should probably require dict keys - to be basic types - - in dbus-keyring.c, enforce that the keyring dir is not world readable/writable diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml index ad78f0a0..75ffeea7 100644 --- a/doc/dbus-specification.xml +++ b/doc/dbus-specification.xml @@ -274,11 +274,13 @@ A DICT_ENTRY works exactly like a struct, but rather than parentheses it uses curly braces, and it has more restrictions. - The restrictions are: it occurs only as an array element type; and it - has exactly two single complete types inside the curly - braces. Implementations must not accept dict entries outside of arrays, - and must not accept dict entries with zero, one, or more than two - fields. A dict entry is always a key-value pair. + The restrictions are: it occurs only as an array element type; it has + exactly two single complete types inside the curly braces; the first + single complete type (the "key") must be a basic type rather than a + container type. Implementations must not accept dict entries outside of + arrays, must not accept dict entries with zero, one, or more than two + fields, and must not accept dict entries with non-basic-typed keys. A + dict entry is always a key-value pair. -- cgit