fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-03-07 05:10:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjust _dbus_spawn_async_with_babysitter() on Windows to follow Unix like OOM behavior

Browse source 
That way, the spawn-oom unit test could expect OOM on Windows to behave
the same as OOM on Unix, raising DBUS_ERROR_NO_MEMORY.
This commit is contained in:
Ralf Habacker 2021-11-30 15:11:01 +01:00
parent d9dc2a74aa
commit 0d37aeb41b
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
dbus/dbus-spawn-win.c
View file

@ -647,6 +647,7 @@ _dbus_spawn_async_with_babysitter (DBusBabysitter **sitter_p,
HANDLE handle;
int argc;
char **my_argv = NULL;
DBusError local_error = DBUS_ERROR_INIT;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
_dbus_assert (argv[0] != NULL);
@ -717,7 +718,7 @@ _dbus_spawn_async_with_babysitter (DBusBabysitter **sitter_p,
_dbus_verbose ("babysitter: spawn child '%s'\n", my_argv[0]);
PING();
handle = _dbus_spawn_program (sitter->log_name, my_argv, (char **) envp, FALSE, NULL);
handle = _dbus_spawn_program (sitter->log_name, my_argv, (char **) envp, FALSE, &local_error);
if (my_argv != NULL)
{
@ -727,13 +728,26 @@ _dbus_spawn_async_with_babysitter (DBusBabysitter **sitter_p,
PING();
if (handle == NULL)
{
sitter->child_handle = NULL;
sitter->have_spawn_errno = TRUE;
sitter->spawn_errno = GetLastError();
dbus_set_error_const (error, DBUS_ERROR_SPAWN_EXEC_FAILED,
"Failed to spawn child");
if (dbus_error_has_name (&local_error, DBUS_ERROR_NO_MEMORY))
{
sitter->child_handle = NULL;
sitter->have_spawn_errno = TRUE;
sitter->spawn_errno = ERROR_NOT_ENOUGH_MEMORY;
dbus_move_error (&local_error, error);
}
else
{
sitter->child_handle = NULL;
sitter->have_spawn_errno = TRUE;
sitter->spawn_errno = GetLastError();
dbus_set_error (error, DBUS_ERROR_SPAWN_EXEC_FAILED,
"Failed to spawn child: %s", local_error.message);
}
dbus_error_free (&local_error);
goto out0;
}
else
dbus_error_free (&local_error);
sitter->child_handle = handle;