From c30990e83f2d750e047baa66ce737b6b06dd70ef Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 28 Mar 2011 17:18:43 +0100 Subject: [PATCH 06/25] marshal_valuearray: simplify teardown If close_container fails, it might be an assertion failure in libdbus, so don't assume it's OOM. We have to handle programming errors somewhat gracefully during marshalling anyway, so there's no point in asserting. --- dbus/dbus-gvalue.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dbus/dbus-gvalue.c b/dbus/dbus-gvalue.c index 2e04064..f71c233 100644 --- a/dbus/dbus-gvalue.c +++ b/dbus/dbus-gvalue.c @@ -1541,13 +1541,7 @@ marshal_valuearray (DBusMessageIter *iter, } } - if (!dbus_message_iter_close_container (iter, &subiter)) - goto oom; - - return TRUE; - oom: - g_error ("out of memory"); - return FALSE; + return dbus_message_iter_close_container (iter, &subiter); } static gboolean -- 1.7.4.1