From 996d216ea6881cbf0700c7990135169e7fb16369 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Tue, 4 Jul 2017 13:31:38 +0100
Subject: [PATCH] dbus_message_append_args_valist: Don't leak memory on
 inappropriate type

Found by source code inspection while trying to debug an unrelated
leak.

Change-Id: I0726c57bb4b0ccdadee2263b14f9fe3fe4ebc99a
Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101568
---
 dbus/dbus-message.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index 67665a1..18388a1 100644
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -2039,6 +2039,7 @@ dbus_message_append_args_valist (DBusMessage *message,
               _dbus_warn ("arrays of %s can't be appended with %s for now\n",
                           _dbus_type_to_string (element_type),
                           _DBUS_FUNCTION_NAME);
+              dbus_message_iter_abandon_container (&iter, &array);
               goto failed;
             }
 
-- 
2.7.4