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.0859: NULL pointer access when term_free_vterm called twice

Browse Source 
Problem:    NULL pointer access when term_free_vterm called twice.
Solution:   Return when tl_vterm is NULL. (Yasuhiro Matsumoto, closes #1934)
This commit is contained in:
Bram Moolenaar 2017-08-04 20:29:53 +02:00
parent eb44a68b42
commit 8e5eece8c5
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/terminal.c
View File

@ -691,8 +691,11 @@ move_terminal_to_buffer(term_T *term)
VTermPos pos; VTermPos pos;
VTermScreenCell cell; VTermScreenCell cell;
VTermScreenCell *p; VTermScreenCell *p;
VTermScreen *screen = vterm_obtain_screen(term->tl_vterm); VTermScreen *screen;
if (term->tl_vterm == NULL)
return;
screen = vterm_obtain_screen(term->tl_vterm);
for (pos.row = 0; pos.row < term->tl_rows; ++pos.row) for (pos.row = 0; pos.row < term->tl_rows; ++pos.row)
{ {
len = 0; len = 0;

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 */
/**/
859,
/**/ /**/
858, 858,
/**/ /**/