tor

commit 8991280f89be0cb157efcaec82880040fba4031b
parent 57999e330b82fa3a360406dfb28b7a35fb50d602
Author: teor <teor@torproject.org>
Date:   Wed, 27 Mar 2019 12:31:37 +1000

Merge branch 'maint-0.4.0'

Diffstat:
A
changes/bug29874
 | 
4
++++
M
src/lib/process/process_win32.c
 | 
7
+------

2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/changes/bug29874 b/changes/bug29874
@@ -0,0 +1,4 @@
+  o Minor bugfixes (pluggable transports):
+    - Restore old behaviour when it comes to discovering the path of a given
+      Pluggable Transport exe-file. Fixes bug 29874; bugfix on 0.4.0.1-alpha.
+
diff --git a/src/lib/process/process_win32.c b/src/lib/process/process_win32.c
@@ -152,11 +152,6 @@ process_win32_exec(process_t *process)
   HANDLE stdin_pipe_read = NULL;
   HANDLE stdin_pipe_write = NULL;
   BOOL ret = FALSE;
-  const char *filename = process_get_command(process);
-
-  /* Not much we can do if we haven't been told what to start. */
-  if (BUG(filename == NULL))
-    return PROCESS_STATUS_ERROR;
 
   /* Setup our security attributes. */
   SECURITY_ATTRIBUTES security_attributes;
@@ -211,7 +206,7 @@ process_win32_exec(process_t *process)
   char *joined_argv = tor_join_win_cmdline((const char **)argv);
 
   /* Create the child process */
-  ret = CreateProcessA(filename,
+  ret = CreateProcessA(NULL,
                        joined_argv,
                        NULL,
                        NULL,