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

job/valgrind: Fix invalid reads/missing free.

Browse Source 
The JobEvent structure may refer to a job after it has been freed. Apply
@tarruda's patch to extract the job data before pushing the event.

Also, fix the type, "data" -> "job", in on_job_exit() and free the job
name in the last job event.
This commit is contained in:
Scott Prager 2014-10-27 11:58:21 -04:00 committed by Thiago de Arruda
parent 7797991ba5
commit d10e83fec2
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/nvim/eval.c
View File

@ -448,9 +448,8 @@ static dictitem_T vimvars_var; /* variable used for v: */
// Memory pool for reusing JobEvent structures // Memory pool for reusing JobEvent structures
typedef struct { typedef struct {
Job *job; int id;
RStream *rstream; char *name, *type, *received;
char *type;
} JobEvent; } JobEvent;
#define JobEventFreer(x) #define JobEventFreer(x)
KMEMPOOL_INIT(JobEventPool, JobEvent, JobEventFreer) KMEMPOOL_INIT(JobEventPool, JobEvent, JobEventFreer)
@ -19527,8 +19526,15 @@ char_u *do_string_sub(char_u *str, char_u *pat, char_u *sub, char_u *flags)
#define push_job_event(j, r, t) \ #define push_job_event(j, r, t) \
do { \ do { \
JobEvent *event_data = kmp_alloc(JobEventPool, job_event_pool); \ JobEvent *event_data = kmp_alloc(JobEventPool, job_event_pool); \
event_data->job = j; \ event_data->received = NULL; \
event_data->rstream = r; \ if (r) { \
size_t read_count = rstream_pending(r); \
event_data->received = xmalloc(read_count + 1); \
rstream_read(r, event_data->received, read_count); \
event_data->received[read_count] = NUL; \
} \
event_data->id = job_id(j); \
event_data->name = job_data(j); \
event_data->type = t; \ event_data->type = t; \
event_push((Event) { \ event_push((Event) { \
.handler = on_job_event, \ .handler = on_job_event, \
@ -19552,39 +19558,28 @@ static void on_job_stderr(RStream *rstream, void *data, bool eof)
static void on_job_exit(Job *job, void *data) static void on_job_exit(Job *job, void *data)
{ {
push_job_event(data, NULL, "exit"); push_job_event(job, NULL, "exit");
} }
static void on_job_event(Event event) static void on_job_event(Event event)
{ {
JobEvent *data = event.data; JobEvent *data = event.data;
Job *job = data->job; apply_job_autocmds(data->id, data->name, data->type, data->received);
char *str = NULL;
if (data->rstream) {
// Read event
size_t read_count = rstream_pending(data->rstream);
str = xmalloc(read_count + 1);
rstream_read(data->rstream, str, read_count);
str[read_count] = NUL;
}
apply_job_autocmds(job, job_data(job), data->type, str);
kmp_free(JobEventPool, job_event_pool, data); kmp_free(JobEventPool, job_event_pool, data);
} }
static void apply_job_autocmds(Job *job, char *name, char *type, char *str) static void apply_job_autocmds(int id, char *name, char *type, char *received)
{ {
// Create the list which will be set to v:job_data // Create the list which will be set to v:job_data
list_T *list = list_alloc(); list_T *list = list_alloc();
list_append_number(list, job_id(job)); list_append_number(list, id);
list_append_string(list, (uint8_t *)type, -1); list_append_string(list, (uint8_t *)type, -1);
if (str) { if (received) {
listitem_T *str_slot = listitem_alloc(); listitem_T *str_slot = listitem_alloc();
str_slot->li_tv.v_type = VAR_STRING; str_slot->li_tv.v_type = VAR_STRING;
str_slot->li_tv.v_lock = 0; str_slot->li_tv.v_lock = 0;
str_slot->li_tv.vval.v_string = (uint8_t *)str; str_slot->li_tv.vval.v_string = (uint8_t *)received;
list_append(list, str_slot); list_append(list, str_slot);
} }
@ -19592,6 +19587,11 @@ static void apply_job_autocmds(Job *job, char *name, char *type, char *str)
set_vim_var_list(VV_JOB_DATA, list); set_vim_var_list(VV_JOB_DATA, list);
// Call JobActivity autocommands // Call JobActivity autocommands
apply_autocmds(EVENT_JOBACTIVITY, (uint8_t *)name, NULL, TRUE, NULL); apply_autocmds(EVENT_JOBACTIVITY, (uint8_t *)name, NULL, TRUE, NULL);
if (!received) {
// This must be the exit event. Free the name.
free(name);
}
} }
static void script_host_eval(char *method, typval_T *argvars, typval_T *rettv) static void script_host_eval(char *method, typval_T *argvars, typval_T *rettv)