From 229f42c7cad5760078fbbe310c1b17e7ab929da1 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 28 Mar 2011 17:27:18 +0100 Subject: [PATCH 19/25] marshal_collection_array: simplify exit path Also don't assume that failure of dbus_message_iter_close_container is always OOM. --- dbus/dbus-gvalue.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dbus/dbus-gvalue.c b/dbus/dbus-gvalue.c index f36acb9..014e957 100644 --- a/dbus/dbus-gvalue.c +++ b/dbus/dbus-gvalue.c @@ -1983,13 +1983,8 @@ marshal_collection_array (DBusMessageIter *iter, return FALSE; } - if (!dbus_message_iter_close_container (iter, &subiter)) - goto oom; g_free (subsignature_str); - return TRUE; - oom: - g_error ("out of memory"); - return FALSE; + return dbus_message_iter_close_container (iter, &subiter); } gboolean -- 1.7.4.1