From b23b2074154582ef796b30879f36c82eeb077e0b Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Mon, 6 Oct 2008 17:09:40 +0200 Subject: Don't allow NULL strings in dictionaries (just ignore them) --- src/dbus-common.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src') diff --git a/src/dbus-common.c b/src/dbus-common.c index 6c15dea2..5d04b481 100644 --- a/src/dbus-common.c +++ b/src/dbus-common.c @@ -300,6 +300,12 @@ void dbus_message_iter_append_dict_entry(DBusMessageIter *dict, { DBusMessageIter entry; + if (type == DBUS_TYPE_STRING) { + const char *str = *((const char **) val); + if (str == NULL) + return; + } + dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY, NULL, &entry); -- cgit