fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-09 11:58:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'windows-error-oom' into 'master'

Browse source 
_dbus_win_set_error_from_last_error: Always set the error

See merge request dbus/dbus!229
This commit is contained in:
Ralf Habacker 2021-12-06 10:08:59 +00:00
commit 649f46642b
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dbus/dbus-sysdeps-win.c
View file

@ -4031,13 +4031,17 @@ _dbus_win_set_error_from_last_error (DBusError *error,
dbus_bool_t retval;
if (!_dbus_string_init (&str))
goto out;
{
_DBUS_SET_OOM (error);
goto out;
}
va_start (args, format);
retval = _dbus_string_append_printf_valist (&str, format, args);
va_end (args);
if (!retval)
{
_DBUS_SET_OOM (error);
_dbus_string_free (&str);
goto out;
}
@ -4053,6 +4057,8 @@ _dbus_win_set_error_from_last_error (DBusError *error,
out:
if (message != NULL)
_dbus_win_free_error_string (message);
_DBUS_ASSERT_ERROR_IS_SET (error);
}
/**