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-errors.c (dbus_set_error): make sure to call va_end if we
	hit an OOM error inside va_start (FDO Bug #12846)
This commit is contained in:
John (J5) Palmieri 2008-01-15 15:30:19 -05:00
parent 1b64602017
commit 97872bf72f
2 changed files with 8 additions and 0 deletions

View file

@ -1,3 +1,10 @@
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-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>

View file

@ -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);