From 1d70ed7bdd61d030f05d0644d24ef5e21db5d31a Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 28 Mar 2011 17:23:46 +0100 Subject: [PATCH 13/25] marshal_variant: abandon broken containers rather than closing them --- 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 0cba32b..3203ed9 100644 --- a/dbus/dbus-gvalue.c +++ b/dbus/dbus-gvalue.c @@ -1812,7 +1812,10 @@ marshal_variant (DBusMessageIter *iter, goto out; if (!_dbus_gvalue_marshal (&subiter, real_value)) - goto out; + { + dbus_message_iter_abandon_container (iter, &subiter); + goto out; + } if (!dbus_message_iter_close_container (iter, &subiter)) goto out; -- 1.7.4.1