diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | dbus/dbus-errors.c | 1 |
2 files changed, 8 insertions, 0 deletions
@@ -2,6 +2,13 @@ * patch by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com> + * 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 <johnp@redhat.com> + + * patch by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com> + * 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 9629c682..6d14ff7a 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); |