Permalink
Browse files

patch 8.0.0942: using freed memory with ":terminal"

Problem:    Using freed memory with ":terminal" if an autocommand changes
            'shell' when splitting the window. (Marius Gedminas)
Solution:   Make a copy of 'shell'. (closes #1974)
  • Loading branch information...
brammool committed Aug 14, 2017
1 parent 05fbfdc commit 4fa1019f8026cb383423fb4086cba7e308591e18
Showing with 8 additions and 2 deletions.
  1. +6 −2 src/terminal.c
  2. +2 −0 src/version.c
View
@@ -392,7 +392,8 @@ term_start(typval_T *argvar, jobopt_T *opt, int forceit)
setup_job_options(opt, term->tl_rows, term->tl_cols);
/* System dependent: setup the vterm and start the job in it. */
if (term_and_job_init(term, term->tl_rows, term->tl_cols, argvar, opt) == OK)
if (term_and_job_init(term, term->tl_rows, term->tl_cols, argvar, opt)
== OK)
{
/* Get and remember the size we ended up with. Update the pty. */
vterm_get_size(term->tl_vterm, &term->tl_rows, &term->tl_cols);
@@ -434,6 +435,7 @@ ex_terminal(exarg_T *eap)
typval_T argvar;
jobopt_T opt;
char_u *cmd;
char_u *tofree = NULL;
init_job_options(&opt);
@@ -462,7 +464,8 @@ ex_terminal(exarg_T *eap)
cmd = skipwhite(p);
}
if (cmd == NULL || *cmd == NUL)
cmd = p_sh;
/* Make a copy, an autocommand may set 'shell'. */
tofree = cmd = vim_strsave(p_sh);
if (eap->addr_count == 2)
{
@@ -480,6 +483,7 @@ ex_terminal(exarg_T *eap)
argvar.v_type = VAR_STRING;
argvar.vval.v_string = cmd;
term_start(&argvar, &opt, eap->forceit);
vim_free(tofree);
}
/*
View
@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
942,
/**/
941,
/**/

0 comments on commit 4fa1019

Please sign in to comment.