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

Fix ambiguous setup of DBusBabySitter struct member child_handle on Windows.

Browse source 
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=95191
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
This commit is contained in:
Ralf Habacker 2016-05-16 12:52:25 +02:00
parent baeea825a4
commit 7bcaf35bca
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -605,6 +605,7 @@ babysitter (void *parameter)
{
int ret = 0;
DBusBabysitter *sitter = (DBusBabysitter *) parameter;
HANDLE handle;
PING();
if (sitter->child_setup)
@ -616,11 +617,14 @@ babysitter (void *parameter)
_dbus_verbose ("babysitter: spawning %s\n", sitter->log_name);
PING();
sitter->child_handle = spawn_program (sitter->log_name,
sitter->argv, sitter->envp);
handle = spawn_program (sitter->log_name, sitter->argv, sitter->envp);
PING();
if (sitter->child_handle == (HANDLE) -1)
if (handle != INVALID_HANDLE_VALUE)
{
sitter->child_handle = handle;
}
else
{
sitter->child_handle = NULL;
sitter->have_spawn_errno = TRUE;