patch 8.0.0859: NULL pointer access when term_free_vterm called twice

Problem: NULL pointer access when term_free_vterm called twice. Solution: Return when tl_vterm is NULL. (Yasuhiro Matsumoto, closes #1934)
vim · Aug 4, 2017 · 8e5eece · 8e5eece
1 parent eb44a68
commit 8e5eece
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/terminal.c b/src/terminal.c
@@ -691,8 +691,11 @@ move_terminal_to_buffer(term_T *term)
     VTermPos	    pos;
     VTermScreenCell cell;
     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)
     {
 	len = 0;

diff --git a/src/version.c b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    859,
 /**/
     858,
 /**/