diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2015-08-21 09:07:06 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2015-08-21 13:28:49 -0300 |
| commit | 1beee0685d33adf15457927b2487e8f89da178a0 (patch) | |
| tree | 38f251f3333a0e103391d78d9adfc076399ca8cf /src | |
| parent | 6e59b7b0e5cfe84db8629c728b942a5fea6bdda3 (diff) | |
| download | rneovim-1beee0685d33adf15457927b2487e8f89da178a0.tar.gz rneovim-1beee0685d33adf15457927b2487e8f89da178a0.tar.bz2 rneovim-1beee0685d33adf15457927b2487e8f89da178a0.zip | |
eval: Protect job callbacks from being redefined
ref: #3188
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 10 | ||||
| -rw-r--r-- | src/nvim/event/process.c | 7 | ||||
| -rw-r--r-- | src/nvim/globals.h | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index a5ab57785c..006601211e 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -18987,7 +18987,7 @@ void ex_function(exarg_T *eap) emsg_funcname(e_funcexts, name); goto erret; } - if (fp->uf_calls > 0) { + if (fp->uf_refcount > 1 || fp->uf_calls > 0) { emsg_funcname(N_("E127: Cannot redefine function %s: It is in use"), name); goto erret; @@ -21136,14 +21136,18 @@ static inline bool common_job_start(TerminalJobData *data, typval_T *rettv) { data->refcount++; Process *proc = (Process *)&data->proc; + char *cmd = xstrdup(proc->argv[0]); if (!process_spawn(proc)) { - EMSG(_(e_jobexe)); + EMSG2(_(e_jobspawn), cmd); + xfree(cmd); if (proc->type == kProcessTypePty) { xfree(data->proc.pty.term_name); - free_term_job_data(data); } + rettv->vval.v_number = proc->status; + term_job_data_decref(data); return false; } + xfree(cmd); data->id = current_job_id++; wstream_init(proc->in, 0); diff --git a/src/nvim/event/process.c b/src/nvim/event/process.c index 81d4e690c3..bacbf4f8c7 100644 --- a/src/nvim/event/process.c +++ b/src/nvim/event/process.c @@ -66,7 +66,12 @@ bool process_spawn(Process *proc) FUNC_ATTR_NONNULL_ALL if (proc->err) { uv_close((uv_handle_t *)&proc->err->uv.pipe, NULL); } - process_close(proc); + + if (proc->type == kProcessTypeUv) { + uv_close((uv_handle_t *)&(((UvProcess *)proc)->uv), NULL); + } else { + process_close(proc); + } shell_free_argv(proc->argv); proc->status = -1; return false; diff --git a/src/nvim/globals.h b/src/nvim/globals.h index 68cb923e42..5126195841 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -1107,6 +1107,8 @@ EXTERN char_u e_isadir2[] INIT(= N_("E17: \"%s\" is a directory")); EXTERN char_u e_invjob[] INIT(= N_("E900: Invalid job id")); EXTERN char_u e_jobtblfull[] INIT(= N_("E901: Job table is full")); EXTERN char_u e_jobexe[] INIT(= N_("E902: \"%s\" is not an executable")); +EXTERN char_u e_jobspawn[] INIT(= N_( + "E903: Process for command \"%s\" could not be spawned")); EXTERN char_u e_jobnotpty[] INIT(= N_("E904: Job is not connected to a pty")); EXTERN char_u e_libcall[] INIT(= N_("E364: Library call failed for \"%s()\"")); EXTERN char_u e_mkdir[] INIT(= N_("E739: Cannot create directory %s: %s")); |