diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-03-28 17:24:53 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-04-13 14:02:15 +0100 |
| commit | 7228321ddafc88e12406ca49406dfaa80240be9d (patch) | |
| tree | 5627ecf17983d189c9a58510a8a9aaa377aa869e | |
| parent | 9e8bed2ec229e48df0b1c63560b183f46d33bffd (diff) | |
marshal_collection_ptrarray: abandon broken containers, simplify exit path
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30171
| -rw-r--r-- | dbus/dbus-gvalue.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/dbus/dbus-gvalue.c b/dbus/dbus-gvalue.c index 6493bc5..13038a2 100644 --- a/dbus/dbus-gvalue.c +++ b/dbus/dbus-gvalue.c @@ -1925,13 +1925,13 @@ marshal_collection_ptrarray (DBusMessageIter *iter, collection_marshal_iterator, &data); - if (!dbus_message_iter_close_container (iter, &subiter)) - goto oom; - - return !data.err; - oom: - g_error ("out of memory"); - return FALSE; + if (data.err) + { + dbus_message_iter_abandon_container (iter, &subiter); + return FALSE; + } + + return dbus_message_iter_close_container (iter, &subiter); } |