nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-17 19:18:06 -05:00
Code Issues Projects Releases Wiki Activity

Fix a handle leak in Windows PSFTP.

Browse Source 
We were checking the return value of CreateThread for validity, but
not keeping it to free afterwards if it _was_ valid. Also, we weren't
closing ctx->event in the valid case either. Patch due to Tim Kosse.
This commit is contained in:
Simon Tatham 2014-12-20 18:42:22 +00:00
parent fe24f4dfba
commit 02dd708116
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
windows/winsftp.c
View File

@ -696,6 +696,7 @@ char *ssh_sftp_get_cmdline(char *prompt, int no_fds_ok)
int ret; int ret;
struct command_read_ctx actx, *ctx = &actx; struct command_read_ctx actx, *ctx = &actx;
DWORD threadid; DWORD threadid;
HANDLE hThread;
fputs(prompt, stdout); fputs(prompt, stdout);
fflush(stdout); fflush(stdout);
@ -712,8 +713,9 @@ char *ssh_sftp_get_cmdline(char *prompt, int no_fds_ok)
ctx->event = CreateEvent(NULL, FALSE, FALSE, NULL); ctx->event = CreateEvent(NULL, FALSE, FALSE, NULL);
ctx->line = NULL; ctx->line = NULL;
if (!CreateThread(NULL, 0, command_read_thread, hThread = CreateThread(NULL, 0, command_read_thread, ctx, 0, &threadid);
ctx, 0, &threadid)) { if (!hThread) {
CloseHandle(ctx->event);
fprintf(stderr, "Unable to create command input thread\n"); fprintf(stderr, "Unable to create command input thread\n");
cleanup_exit(1); cleanup_exit(1);
} }
@ -725,6 +727,9 @@ char *ssh_sftp_get_cmdline(char *prompt, int no_fds_ok)
assert(ret >= 0); assert(ret >= 0);
} while (ret == 0); } while (ret == 0);
CloseHandle(hThread);
CloseHandle(ctx->event);
return ctx->line; return ctx->line;
} }