diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-05-15 18:18:21 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-05-15 18:18:21 -0400 |
| commit | df376d2e49ba3b73baa447afee16374eb9cad623 (patch) | |
| tree | 118f716272f692631250291bd1273f1403f5438c /src | |
| parent | bbc13e6459ac67278e3003e7c75fcfa0df7e404d (diff) | |
| parent | 36fb600a9e98b1f41f53783977bbd7b96c254a1b (diff) | |
| download | rneovim-df376d2e49ba3b73baa447afee16374eb9cad623.tar.gz rneovim-df376d2e49ba3b73baa447afee16374eb9cad623.tar.bz2 rneovim-df376d2e49ba3b73baa447afee16374eb9cad623.zip | |
Merge pull request #4764 from justinmk/term-double-free
test: ex_terminal() double-free
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_docmd.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 89c35a3c45..9a68a7c2a5 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -9497,12 +9497,14 @@ static void ex_folddo(exarg_T *eap) static void ex_terminal(exarg_T *eap) { - // We will call termopen() with ['shell'] if not given a {cmd}. - char *name = (char *)p_sh; + char *name = (char *)p_sh; // Default to 'shell' if {cmd} is not given. + bool mustfree = false; char *lquote = "['"; char *rquote = "']"; + if (*eap->arg != NUL) { name = (char *)vim_strsave_escaped(eap->arg, (char_u *)"\"\\"); + mustfree = true; lquote = rquote = "\""; } @@ -9512,7 +9514,7 @@ static void ex_terminal(exarg_T *eap) eap->forceit==TRUE ? "!" : "", lquote, name, rquote); do_cmdline_cmd(ex_cmd); - if (name != (char *)p_sh) { + if (mustfree) { xfree(name); } } |