Permalink
Browse files

patch 8.0.0781: MS-Windows: memory leak when using :terminal

Problem:    MS-Windows: Memory leak when using :terminal.
Solution:   Handle failures properly. (Ken Takata)
  • Loading branch information...
brammool committed Jul 27, 2017
1 parent cb25d18 commit ab6eec3887d68c260b50b1b8f9ed95d49d9306c6
Showing with 14 additions and 3 deletions.
  1. +12 −3 src/terminal.c
  2. +2 −0 src/version.c
View
@@ -1153,18 +1153,19 @@ dyn_winpty_init(void)
static int
term_and_job_init(term_T *term, int rows, int cols, char_u *cmd)
{
WCHAR *p = enc_to_utf16(cmd, NULL);
WCHAR *p;
channel_T *channel = NULL;
job_T *job = NULL;
jobopt_T opt;
DWORD error;
HANDLE jo = NULL, child_process_handle, child_thread_handle;
void *winpty_err;
void *spawn_config;
void *spawn_config = NULL;
if (!dyn_winpty_init())
return FAIL;
p = enc_to_utf16(cmd, NULL);
if (p == NULL)
return FAIL;
@@ -1227,9 +1228,14 @@ term_and_job_init(term_T *term, int rows, int cols, char_u *cmd)
goto failed;
if (!AssignProcessToJobObject(jo, child_process_handle))
goto failed;
{
/* Failed, switch the way to terminate process with TerminateProcess. */
CloseHandle(jo);
jo = NULL;
}
winpty_spawn_config_free(spawn_config);
vim_free(p);
create_vterm(term, rows, cols);
@@ -1246,6 +1252,9 @@ term_and_job_init(term_T *term, int rows, int cols, char_u *cmd)
return OK;
failed:
if (spawn_config != NULL)
winpty_spawn_config_free(spawn_config);
vim_free(p);
if (channel != NULL)
channel_clear(channel);
if (job != NULL)
View
@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
781,
/**/
780,
/**/

0 comments on commit ab6eec3

Please sign in to comment.