aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.0.0784: job of terminal may be garbage collected

Browse Source 
Problem:    Job of terminal may be garbage collected.
Solution:   Set copyID on job in terminal. (Ozaki Kiichi)
This commit is contained in:
Bram Moolenaar 2017-07-27 22:14:59 +02:00
parent 0e83f02d80
commit a2c45a17c1
4 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/eval.c
View File

@ -5329,6 +5329,10 @@ garbage_collect(int testing)
abort = abort || set_ref_in_quickfix(copyID); abort = abort || set_ref_in_quickfix(copyID);
#endif #endif
#ifdef FEAT_TERMINAL
abort = abort || set_ref_in_term(copyID);
#endif
if (!abort) if (!abort)
{ {
/* /*

1
src/proto/terminal.pro
View File

@ -6,4 +6,5 @@ void terminal_loop(void);
void term_job_ended(job_T *job); void term_job_ended(job_T *job);
void term_update_window(win_T *wp); void term_update_window(win_T *wp);
char_u *term_get_status_text(term_T *term); char_u *term_get_status_text(term_T *term);
int set_ref_in_term(int copyID);
/* vim: set ft=c : */ /* vim: set ft=c : */

20
src/terminal.c
View File

@ -1371,6 +1371,26 @@ term_report_winsize(term_T *term, int rows, int cols)
} }
} }
/*
* Mark references in jobs of terminals.
*/
int
set_ref_in_term(int copyID)
{
int abort = FALSE;
term_T *term;
typval_T tv;
for (term = first_term; term != NULL; term = term->tl_next)
if (term->tl_job != NULL)
{
tv.v_type = VAR_JOB;
tv.vval.v_job = term->tl_job;
abort = abort || set_ref_in_item(&tv, copyID, NULL, NULL);
}
return abort;
}
# endif # endif
#endif /* FEAT_TERMINAL */ #endif /* FEAT_TERMINAL */

2
src/version.c
View File

@ -769,6 +769,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 */
/**/
784,
/**/ /**/
783, 783,
/**/ /**/