From 63369efdda8ec1a770b315eab0766f7d149f01d8 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 28 Mar 2011 17:16:29 +0100 Subject: [PATCH 05/25] marshal_valuearray: abandon the container if we fail --- dbus/dbus-gvalue.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dbus/dbus-gvalue.c b/dbus/dbus-gvalue.c index 5922dd2..2e04064 100644 --- a/dbus/dbus-gvalue.c +++ b/dbus/dbus-gvalue.c @@ -1534,7 +1534,10 @@ marshal_valuearray (DBusMessageIter *iter, for (i = 0; i < array->n_values; i++) { if (!_dbus_gvalue_marshal (&subiter, g_value_array_get_nth (array, i))) - return FALSE; + { + dbus_message_iter_abandon_container (iter, &subiter); + return FALSE; + } } } -- 1.7.4.1