aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 7.4.1386

Browse Source 
Problem:    When the Job exit callback is invoked, the job may be freed too
            soon. (Yasuhiro Matsumoto)
Solution:   Increase refcount.
This commit is contained in:
Bram Moolenaar
2016-02-22 11:39:27 +01:00
parent 5e83840756
commit 23c463a157
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/eval.c
View File

@@ -15039,7 +15039,8 @@ job_status(job_T *job)
typval_T rettv; typval_T rettv;
int dummy; int dummy;
/* invoke the exit callback */ /* invoke the exit callback; make sure the refcount is > 0 */
++job->jv_refcount;
argv[0].v_type = VAR_JOB; argv[0].v_type = VAR_JOB;
argv[0].vval.v_job = job; argv[0].vval.v_job = job;
argv[1].v_type = VAR_NUMBER; argv[1].v_type = VAR_NUMBER;
@@ -15047,10 +15048,11 @@ job_status(job_T *job)
call_func(job->jv_exit_cb, (int)STRLEN(job->jv_exit_cb), call_func(job->jv_exit_cb, (int)STRLEN(job->jv_exit_cb),
&rettv, 2, argv, 0L, 0L, &dummy, TRUE, NULL); &rettv, 2, argv, 0L, 0L, &dummy, TRUE, NULL);
clear_tv(&rettv); clear_tv(&rettv);
--job->jv_refcount;
} }
if (job->jv_status == JOB_ENDED && job->jv_refcount == 0) if (job->jv_status == JOB_ENDED && job->jv_refcount == 0)
{ {
/* The job already was unreferenced, now that it ended it can be /* The job was already unreferenced, now that it ended it can be
* freed. Careful: caller must not use "job" after this! */ * freed. Careful: caller must not use "job" after this! */
job_free(job); job_free(job);
} }

2
src/version.c
View File

@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1386,
/**/ /**/
1385, 1385,
/**/ /**/