dbus_message_append_args_valist: Don't leak memory on inappropriate type
authorSimon McVittie <smcv@collabora.com>
Tue, 4 Jul 2017 12:31:38 +0000 (13:31 +0100)
committerSimon McVittie <smcv@collabora.com>
Wed, 5 Jul 2017 12:13:07 +0000 (13:13 +0100)
Found by source code inspection while trying to debug an unrelated
leak.

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

index 27b8f46..6d9dd55 100644 (file)
@@ -1891,6 +1891,7 @@ dbus_message_append_args_valist (DBusMessage *message,
               _dbus_warn ("arrays of %s can't be appended with %s for now",
                           _dbus_type_to_string (element_type),
                           _DBUS_FUNCTION_NAME);
+              dbus_message_iter_abandon_container (&iter, &array);
               goto failed;
             }