From e57a368c440aec39caf6c3b491cf76ef615dc2e8 Mon Sep 17 00:00:00 2001 From: Scott James Remnant Date: Thu, 9 Jul 2009 16:34:54 +0100 Subject: bfo22316 - add dbus_message_iter_abandon_container() It's not currently possible to abandon creation of a container without either hitting asserts or leaking memory. This new function allows that. Signed-off-by: Scott James Remnant --- dbus/dbus-message-util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dbus/dbus-message-util.c') diff --git a/dbus/dbus-message-util.c b/dbus/dbus-message-util.c index 3d5a00f5..b995f5ee 100644 --- a/dbus/dbus-message-util.c +++ b/dbus/dbus-message-util.c @@ -1296,8 +1296,8 @@ _dbus_message_test (const char *test_data_dir) /* uh-oh, error, try and unwind */ - _dbus_assert (dbus_message_iter_close_container (&array_iter, &struct_iter)); - _dbus_assert (dbus_message_iter_close_container (&array_iter, &iter)); + dbus_message_iter_abandon_container (&array_iter, &struct_iter); + dbus_message_iter_abandon_container (&array_iter, &iter); dbus_message_unref (message); -- cgit