mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-15 07:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

eval: Fixes to job control

Browse Source 
- Ensure TerminalJobData is freed in case of error when spawning pty jobs
- Check if job was stopped in every function that receives a job id.
This commit is contained in:
Thiago de Arruda
2015-07-18 09:40:02 -03:00
parent a10b327073
commit 024b1f39a3
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/nvim/eval.c
View File

@@ -10778,7 +10778,7 @@ static void f_jobclose(typval_T *argvars, typval_T *rettv)
return; return;
} }
TerminalJobData *data = pmap_get(uint64_t)(jobs, argvars[0].vval.v_number); TerminalJobData *data = find_job(argvars[0].vval.v_number);
if (!data) { if (!data) {
EMSG(_(e_invjob)); EMSG(_(e_invjob));
return; return;
@@ -10819,7 +10819,7 @@ static void f_jobsend(typval_T *argvars, typval_T *rettv)
return; return;
} }
TerminalJobData *data = pmap_get(uint64_t)(jobs, argvars[0].vval.v_number); TerminalJobData *data = find_job(argvars[0].vval.v_number);
if (!data) { if (!data) {
EMSG(_(e_invjob)); EMSG(_(e_invjob));
return; return;
@@ -10860,7 +10860,7 @@ static void f_jobresize(typval_T *argvars, typval_T *rettv)
} }
TerminalJobData *data = pmap_get(uint64_t)(jobs, argvars[0].vval.v_number); TerminalJobData *data = find_job(argvars[0].vval.v_number);
if (!data) { if (!data) {
EMSG(_(e_invjob)); EMSG(_(e_invjob));
return; return;
@@ -11007,8 +11007,8 @@ static void f_jobstop(typval_T *argvars, typval_T *rettv)
} }
TerminalJobData *data = pmap_get(uint64_t)(jobs, argvars[0].vval.v_number); TerminalJobData *data = find_job(argvars[0].vval.v_number);
if (!data || data->stopped) { if (!data) {
EMSG(_(e_invjob)); EMSG(_(e_invjob));
return; return;
} }
@@ -11053,7 +11053,7 @@ static void f_jobwait(typval_T *argvars, typval_T *rettv)
for (listitem_T *arg = args->lv_first; arg != NULL; arg = arg->li_next) { for (listitem_T *arg = args->lv_first; arg != NULL; arg = arg->li_next) {
TerminalJobData *data = NULL; TerminalJobData *data = NULL;
if (arg->li_tv.v_type != VAR_NUMBER if (arg->li_tv.v_type != VAR_NUMBER
|| !(data = pmap_get(uint64_t)(jobs, arg->li_tv.vval.v_number))) { || !(data = find_job(arg->li_tv.vval.v_number))) {
list_append_number(rv, -3); list_append_number(rv, -3);
} else { } else {
// append the list item and set the status pointer so we'll collect the // append the list item and set the status pointer so we'll collect the
@@ -11077,7 +11077,7 @@ static void f_jobwait(typval_T *argvars, typval_T *rettv)
break; break;
} }
if (arg->li_tv.v_type != VAR_NUMBER if (arg->li_tv.v_type != VAR_NUMBER
|| !(data = pmap_get(uint64_t)(jobs, arg->li_tv.vval.v_number))) { || !(data = find_job(arg->li_tv.vval.v_number))) {
continue; continue;
} }
int status = process_wait((Process *)&data->proc, remaining); int status = process_wait((Process *)&data->proc, remaining);
@@ -11106,7 +11106,7 @@ static void f_jobwait(typval_T *argvars, typval_T *rettv)
for (listitem_T *arg = args->lv_first; arg != NULL; arg = arg->li_next) { for (listitem_T *arg = args->lv_first; arg != NULL; arg = arg->li_next) {
TerminalJobData *data = NULL; TerminalJobData *data = NULL;
if (arg->li_tv.v_type != VAR_NUMBER if (arg->li_tv.v_type != VAR_NUMBER
|| !(data = pmap_get(uint64_t)(jobs, arg->li_tv.vval.v_number))) { || !(data = find_job(arg->li_tv.vval.v_number))) {
continue; continue;
} }
// remove the status pointer because the list may be freed before the // remove the status pointer because the list may be freed before the
@@ -21096,6 +21096,10 @@ static inline bool common_job_start(TerminalJobData *data, typval_T *rettv)
Process *proc = (Process *)&data->proc; Process *proc = (Process *)&data->proc;
if (!process_spawn(&loop, proc)) { if (!process_spawn(&loop, proc)) {
EMSG(_(e_jobexe)); EMSG(_(e_jobexe));
if (proc->type == kProcessTypePty) {
xfree(data->proc.pty.term_name);
free_term_job_data(data);
}
return false; return false;
} }
@@ -21305,6 +21309,15 @@ end:
xfree(ev); xfree(ev);
} }
static TerminalJobData *find_job(uint64_t id)
{
TerminalJobData *data = pmap_get(uint64_t)(jobs, id);
if (!data || data->stopped) {
return NULL;
}
return data;
}
static void script_host_eval(char *name, typval_T *argvars, typval_T *rettv) static void script_host_eval(char *name, typval_T *argvars, typval_T *rettv)
{ {
if (check_restricted() || check_secure()) { if (check_restricted() || check_secure()) {