IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

eval.c: Garbage collection frees dictionary before job cleanup

Browse Source 
Removing a job too early from the joblist gives garbage collection the
chance to also remove the job dictionary.

Can be triggered with ASAN while waiting 'updatetime'ms (~5 seconds)
before closing the terminal window opened with:

    nvim -u NONE +'call termopen("true",{})'
This commit is contained in:
oni-link 2016-09-02 01:51:23 +02:00
parent fe06e2a4a0
commit 1c9d7270a8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/eval.c
View File

@ -21768,6 +21768,9 @@ static inline bool common_job_start(TerminalJobData *data, typval_T *rettv)
return false; return false;
} }
data->id = next_chan_id++;
pmap_put(uint64_t)(jobs, data->id, data);
data->refcount++; data->refcount++;
char *cmd = xstrdup(proc->argv[0]); char *cmd = xstrdup(proc->argv[0]);
if (!process_spawn(proc)) { if (!process_spawn(proc)) {
@ -21782,7 +21785,6 @@ static inline bool common_job_start(TerminalJobData *data, typval_T *rettv)
} }
xfree(cmd); xfree(cmd);
data->id = next_chan_id++;
if (data->rpc) { if (data->rpc) {
// the rpc channel takes over the in and out streams // the rpc channel takes over the in and out streams
@ -21799,7 +21801,6 @@ static inline bool common_job_start(TerminalJobData *data, typval_T *rettv)
rstream_init(proc->err, 0); rstream_init(proc->err, 0);
rstream_start(proc->err, on_job_stderr, data); rstream_start(proc->err, on_job_stderr, data);
} }
pmap_put(uint64_t)(jobs, data->id, data);
rettv->vval.v_number = data->id; rettv->vval.v_number = data->id;
return true; return true;
} }
@ -21821,6 +21822,7 @@ static inline void free_term_job_data_event(void **argv)
dict_unref(data->self); dict_unref(data->self);
} }
queue_free(data->events); queue_free(data->events);
pmap_del(uint64_t)(jobs, data->id);
xfree(data); xfree(data);
} }
@ -21927,7 +21929,6 @@ static void on_process_exit(Process *proc, int status, void *d)
process_job_event(data, data->on_exit, "exit", NULL, 0, status); process_job_event(data, data->on_exit, "exit", NULL, 0, status);
pmap_del(uint64_t)(jobs, data->id);
term_job_data_decref(data); term_job_data_decref(data);
} }