git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libiberty: fix memory leak in pex-win32.c and refactor 

Fix memory leak of cmdline buffer and refactor to have
cleanup code appear once for all exit cases.

libiberty/ChangeLog:

	* pex-win32.c (win32_spawn): Fix memory leak of cmdline
	buffer and refactor to have cleanup code appear once
	for all exit cases.

Signed-off-by: Jonathan Yong <10walls@gmail.com>
This commit is contained in:
Costas Argyris 2023-02-26 16:34:11 +00:00 committed by Jonathan Yong
parent dbeccab7a1
commit 59bc2b68de
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libiberty/pex-win32.c
View File

@ -577,14 +577,12 @@ win32_spawn (const char *executable,
LPSTARTUPINFO si,
LPPROCESS_INFORMATION pi)
{
char *full_executable;
char *cmdline;
char *full_executable = NULL;
char *cmdline = NULL;
pid_t pid = (pid_t) -1;
char **env_copy;
char *env_block = NULL;
full_executable = NULL;
cmdline = NULL;
if (env)
{
int env_size;
@ -622,13 +620,13 @@ win32_spawn (const char *executable,
full_executable = find_executable (executable, search);
if (!full_executable)
goto error;
goto exit;
cmdline = argv_to_cmdline (argv);
if (!cmdline)
goto error;
goto exit;
/* Create the child process. */
if (!CreateProcess (full_executable, cmdline,
if (CreateProcess (full_executable, cmdline,
/*lpProcessAttributes=*/NULL,
/*lpThreadAttributes=*/NULL,
/*bInheritHandles=*/TRUE,
@ -638,26 +636,17 @@ win32_spawn (const char *executable,
si,
pi))
{
free (env_block);
free (full_executable);
return (pid_t) -1;
CloseHandle (pi->hThread);
pid = (pid_t) pi->hProcess;
}
exit:
/* Clean up. */
CloseHandle (pi->hThread);
free (full_executable);
free (env_block);
return (pid_t) pi->hProcess;
error:
free (env_block);
free (cmdline);
free (full_executable);
return (pid_t) -1;
return pid;
}
/* Spawn a script. This simulates the Unix script execution mechanism.