From 97872bf72ff327855e2e86a4760348cd2ca03b9e Mon Sep 17 00:00:00 2001 From: "John (J5) Palmieri" Date: Tue, 15 Jan 2008 15:30:19 -0500 Subject: [PATCH] make sure to call va_end if we hit an OOM error inside va_start (FDO Bug #12846) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-01-15 John (J5) Palmieri * patch by Kimmo Hämäläinen * dbus/dbus-errors.c (dbus_set_error): make sure to call va_end if we hit an OOM error inside va_start (FDO Bug #12846) --- ChangeLog | 7 +++++++ dbus/dbus-errors.c | 1 + 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index c3d79d1..84faa73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,13 @@ * patch by Kimmo Hämäläinen + * dbus/dbus-errors.c (dbus_set_error): make sure to call va_end if we + hit an OOM error inside va_start (FDO Bug #12846) + +2008-01-15 John (J5) Palmieri + + * patch by Kimmo Hämäläinen + * dbus/dbus-connection.c (dbus_connection_send_with_reply): fix possible crash if pending_return is NULL (FDO Bug #12673) diff --git a/dbus/dbus-errors.c b/dbus/dbus-errors.c index 9629c68..6d14ff7 100644 --- a/dbus/dbus-errors.c +++ b/dbus/dbus-errors.c @@ -384,6 +384,7 @@ dbus_set_error (DBusError *error, if (!_dbus_string_append_printf_valist (&str, format, args)) { _dbus_string_free (&str); + va_end (args); goto nomem; } va_end (args); -- 2.7.4