From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Wed, 24 Nov 2021 08:47:49 +0000 (+0100)
Subject: _dbus_spawn_program() now returns #NULL for unification in case of error
X-Git-Tag: dbus-1.13.20~21^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba1dc32667ac4bf892d4219ec8e3a5a712d008db;p=thirdparty%2Fdbus.git

_dbus_spawn_program() now returns #NULL for unification in case of error
---

diff --git a/dbus/dbus-spawn-win.c b/dbus/dbus-spawn-win.c
index 07d03bace..f0773aa7f 100644
--- a/dbus/dbus-spawn-win.c
+++ b/dbus/dbus-spawn-win.c
@@ -514,7 +514,7 @@ _dbus_spawn_program (const char *name,
   arg_string = build_commandline (argv);
 #endif
   if (!arg_string)
-    return INVALID_HANDLE_VALUE;
+    return NULL;
 
   env_string = build_env_string(envp);
 
@@ -545,7 +545,7 @@ _dbus_spawn_program (const char *name,
     free (env_string);
 
   if (!result)
-    return INVALID_HANDLE_VALUE;
+    return NULL;
 
   CloseHandle (pi.hThread);
   return pi.hProcess;
@@ -680,7 +680,7 @@ _dbus_spawn_async_with_babysitter (DBusBabysitter           **sitter_p,
     }
 
   PING();
-  if (handle == INVALID_HANDLE_VALUE)
+  if (handle == NULL)
     {
       sitter->child_handle = NULL;
       sitter->have_spawn_errno = TRUE;
diff --git a/tools/dbus-run-session.c b/tools/dbus-run-session.c
index 290fcc409..f481d7cef 100644
--- a/tools/dbus-run-session.c
+++ b/tools/dbus-run-session.c
@@ -442,7 +442,7 @@ run_session (const char *dbus_daemon,
   dbus_daemon_argv[4] = NULL;
 
   server_handle = _dbus_spawn_program (dbus_daemon, dbus_daemon_argv, NULL, TRUE);
-  if (!server_handle)
+  if (server_handle == NULL)
     {
       _dbus_win_set_error_from_last_error (&error, "Could not start dbus daemon");
       goto out;
@@ -530,7 +530,7 @@ run_session (const char *dbus_daemon,
     goto out;
 
   app_handle = _dbus_spawn_program (argv[prog_arg], argv + prog_arg, env, FALSE);
-  if (!app_handle)
+  if (app_handle == NULL)
     {
       _dbus_win_set_error_from_last_error (&error, "Unable to start child process");
       goto out;