diff options
| author | Havoc Pennington <hp@redhat.com> | 2007-06-13 21:15:33 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2007-06-13 21:15:33 +0000 |
| commit | 62f09b8bc6ca258a54a316b452d28f1c590d51c1 (patch) | |
| tree | 7fa1d0c96c9c91f100dac1aa87839912370f5e8a | |
| parent | 72697649524238bd8389670e71c9faa55b7b4a1a (diff) | |
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)
| -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); |