diff options
| author | Scott James Remnant <scott@ubuntu.com> | 2009-07-09 16:34:54 +0100 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2009-07-14 15:39:11 -0400 |
| commit | 2ff4bc2513db5a0c64297fbf4c5a8486c737a12a (patch) | |
| tree | 3b1276178c7d0c19060baf61f4418825fe8e9b2d /dbus/dbus-message-util.c | |
| parent | bf2183345fbd19632e81b107593ca4e944d798de (diff) | |
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 <scott@ubuntu.com>
(cherry picked from commit e57a368c440aec39caf6c3b491cf76ef615dc2e8)
Diffstat (limited to 'dbus/dbus-message-util.c')
| -rw-r--r-- | dbus/dbus-message-util.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |