diff options
| author | Scott Prager <splinterofchaos@gmail.com> | 2015-04-19 10:53:24 -0400 |
|---|---|---|
| committer | Scott Prager <splinterofchaos@gmail.com> | 2015-04-23 18:27:32 -0400 |
| commit | d350d12a00518aa0d9e3a1d49c6815c3398d882f (patch) | |
| tree | 3624fdef39d3a407543eaed2eaf0fc2d2fb7154f /src/nvim/eval.c | |
| parent | 920381c01b72724d4088b1a807eeda8e468194da (diff) | |
| download | rneovim-d350d12a00518aa0d9e3a1d49c6815c3398d882f.tar.gz rneovim-d350d12a00518aa0d9e3a1d49c6815c3398d882f.tar.bz2 rneovim-d350d12a00518aa0d9e3a1d49c6815c3398d882f.zip | |
rpcstart: check argvars, /then/ alloc argv #2462
fixes #2458
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index b9768978e5..24502116f3 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -12887,15 +12887,16 @@ static void f_rpcstart(typval_T *argvars, typval_T *rettv) } } + if (argvars[0].vval.v_string == NULL || argvars[0].vval.v_string[0] == NUL) { + EMSG(_(e_api_spawn_failed)); + return; + } + // Allocate extra memory for the argument vector and the NULL pointer int argvl = argsl + 2; char **argv = xmalloc(sizeof(char_u *) * argvl); // Copy program name - if (argvars[0].vval.v_string == NULL || argvars[0].vval.v_string[0] == NUL) { - EMSG(_(e_api_spawn_failed)); - return; - } argv[0] = xstrdup((char *)argvars[0].vval.v_string); int i = 1; |