nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.0'

Browse Source
This commit is contained in:
teor 2019-03-27 12:31:37 +10:00
commit 8991280f89
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug29874 Normal file
View File

@ -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.

7
src/lib/process/process_win32.c
View File

@ -152,11 +152,6 @@ process_win32_exec(process_t *process)
HANDLE stdin_pipe_read = NULL; HANDLE stdin_pipe_read = NULL;
HANDLE stdin_pipe_write = NULL; HANDLE stdin_pipe_write = NULL;
BOOL ret = FALSE; 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. */ /* Setup our security attributes. */
SECURITY_ATTRIBUTES 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); char *joined_argv = tor_join_win_cmdline((const char **)argv);
/* Create the child process */ /* Create the child process */
ret = CreateProcessA(filename, ret = CreateProcessA(NULL,
joined_argv, joined_argv,
NULL, NULL,
NULL, NULL,