Mirrors_Framework/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-05-28 03:26:15 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

process: Don't duplicate NULL stdio handles on Windows.

Browse Source 
It's okay to pass null handles to win32's CreateProcess().

Fixes #14977.
This commit is contained in:
Ryan C. Gordon
2026-03-30 16:17:27 -04:00
parent b878ab1691
commit f13cd9a666
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/process/windows/SDL_windowsprocess.c
+17 -4
View File
@@ -263,6 +263,7 @@ bool SDL_SYS_CreateProcessWithProperties(SDL_Process *process, SDL_PropertiesID
HANDLE stdin_pipe[2] = { INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE }; HANDLE stdin_pipe[2] = { INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE };
HANDLE stdout_pipe[2] = { INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE }; HANDLE stdout_pipe[2] = { INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE };
HANDLE stderr_pipe[2] = { INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE }; HANDLE stderr_pipe[2] = { INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE };
HANDLE handle;
DWORD pipe_mode = PIPE_NOWAIT; DWORD pipe_mode = PIPE_NOWAIT;
bool result = false; bool result = false;
@@ -357,7 +358,10 @@ bool SDL_SYS_CreateProcessWithProperties(SDL_Process *process, SDL_PropertiesID
break; break;
case SDL_PROCESS_STDIO_INHERITED: case SDL_PROCESS_STDIO_INHERITED:
default: default:
if (!DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_INPUT_HANDLE), handle = GetStdHandle(STD_INPUT_HANDLE);
if (!handle) {
startup_info.hStdInput = NULL;
} else if (!DuplicateHandle(GetCurrentProcess(), handle,
GetCurrentProcess(), &startup_info.hStdInput, GetCurrentProcess(), &startup_info.hStdInput,
0, TRUE, DUPLICATE_SAME_ACCESS)) { 0, TRUE, DUPLICATE_SAME_ACCESS)) {
startup_info.hStdInput = INVALID_HANDLE_VALUE; startup_info.hStdInput = INVALID_HANDLE_VALUE;
@@ -394,7 +398,10 @@ bool SDL_SYS_CreateProcessWithProperties(SDL_Process *process, SDL_PropertiesID
break; break;
case SDL_PROCESS_STDIO_INHERITED: case SDL_PROCESS_STDIO_INHERITED:
default: default:
if (!DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_OUTPUT_HANDLE), handle = GetStdHandle(STD_OUTPUT_HANDLE);
if (!handle) {
startup_info.hStdOutput = NULL;
} else if (!DuplicateHandle(GetCurrentProcess(), handle,
GetCurrentProcess(), &startup_info.hStdOutput, GetCurrentProcess(), &startup_info.hStdOutput,
0, TRUE, DUPLICATE_SAME_ACCESS)) { 0, TRUE, DUPLICATE_SAME_ACCESS)) {
startup_info.hStdOutput = INVALID_HANDLE_VALUE; startup_info.hStdOutput = INVALID_HANDLE_VALUE;
@@ -405,7 +412,10 @@ bool SDL_SYS_CreateProcessWithProperties(SDL_Process *process, SDL_PropertiesID
} }
if (redirect_stderr) { if (redirect_stderr) {
if (!DuplicateHandle(GetCurrentProcess(), startup_info.hStdOutput, handle = startup_info.hStdOutput;
if (!handle) {
startup_info.hStdError = NULL;
} else if (!DuplicateHandle(GetCurrentProcess(), handle,
GetCurrentProcess(), &startup_info.hStdError, GetCurrentProcess(), &startup_info.hStdError,
0, TRUE, DUPLICATE_SAME_ACCESS)) { 0, TRUE, DUPLICATE_SAME_ACCESS)) {
startup_info.hStdError = INVALID_HANDLE_VALUE; startup_info.hStdError = INVALID_HANDLE_VALUE;
@@ -440,7 +450,10 @@ bool SDL_SYS_CreateProcessWithProperties(SDL_Process *process, SDL_PropertiesID
break; break;
case SDL_PROCESS_STDIO_INHERITED: case SDL_PROCESS_STDIO_INHERITED:
default: default:
if (!DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_ERROR_HANDLE), handle = GetStdHandle(STD_ERROR_HANDLE);
if (!handle) {
startup_info.hStdError = NULL;
} else if (!DuplicateHandle(GetCurrentProcess(), handle,
GetCurrentProcess(), &startup_info.hStdError, GetCurrentProcess(), &startup_info.hStdError,
0, TRUE, DUPLICATE_SAME_ACCESS)) { 0, TRUE, DUPLICATE_SAME_ACCESS)) {
startup_info.hStdError = INVALID_HANDLE_VALUE; startup_info.hStdError = INVALID_HANDLE_VALUE;