diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | dbus/dbus-message.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,4 +1,10 @@ 2007-06-13 Havoc Pennington <hp@redhat.com> + + * dbus/dbus-message.c (dbus_message_iter_open_container): Fix + broken return_if_fail (kind of scary that test suite does not + cover this) + +2007-06-13 Havoc Pennington <hp@redhat.com> * dbus/dbus-server-socket.c (_dbus_server_listen_socket): support all_interfaces=true|false for tcp servers diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c index a64888ef..c728d6d3 100644 --- a/dbus/dbus-message.c +++ b/dbus/dbus-message.c @@ -2359,7 +2359,7 @@ dbus_message_iter_open_container (DBusMessageIter *iter, * dict entries are invalid signatures standalone (they must be in * an array) */ - _dbus_return_val_if_fail (type == DBUS_TYPE_DICT_ENTRY || + _dbus_return_val_if_fail ((type == DBUS_TYPE_ARRAY && contained_signature && *contained_signature == DBUS_DICT_ENTRY_BEGIN_CHAR) || (contained_signature == NULL || _dbus_check_is_valid_signature (contained_signature)), FALSE); |