mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-29 06:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

eval: Protect job callbacks from being redefined

Browse Source 
ref: #3188
This commit is contained in:
Thiago de Arruda
2015-08-21 09:07:06 -03:00
parent 6e59b7b0e5
commit 1beee0685d
4 changed files with 51 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/eval.c
View File

@@ -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);

7
src/nvim/event/process.c
View File

@@ -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;

2
src/nvim/globals.h
View File

@@ -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"));