]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
Fix warning: variable 'ret' set but not used [-Wunused-but-set-variable].
authorRalf Habacker <ralf.habacker@freenet.de>
Mon, 2 Nov 2015 20:56:32 +0000 (21:56 +0100)
committerRalf Habacker <ralf.habacker@freenet.de>
Tue, 3 Nov 2015 13:23:22 +0000 (14:23 +0100)
Only set valid child status in case exit code has been gotten from
child process, otherwise signal failure through thread return value.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92721
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
dbus/dbus-spawn-win.c

index 7f68f14e5f5cdee6bd073037b0a5703fe5441e95..faf1ab4d62cc25e6701004cd41007066b567e241 100644 (file)
@@ -616,13 +616,16 @@ babysitter (void *parameter)
       DWORD status;
 
       PING();
+      // wait until process finished
       WaitForSingleObject (sitter->child_handle, INFINITE);
 
       PING();
       ret = GetExitCodeProcess (sitter->child_handle, &status);
-
-      sitter->child_status = status;
-      sitter->have_child_status = TRUE;
+      if (ret)
+        {
+          sitter->child_status = status;
+          sitter->have_child_status = TRUE;
+        }
 
       CloseHandle (sitter->child_handle);
       sitter->child_handle = NULL;
@@ -637,7 +640,7 @@ babysitter (void *parameter)
 
   _dbus_babysitter_unref (sitter);
 
-  return 0;
+  return ret ? 0 : 1;
 }
 
 dbus_bool_t