From 8e5eece8c5f22a2235edeb743d06253f6c54cfdc Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 4 Aug 2017 20:29:53 +0200 Subject: 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) --- src/terminal.c | 5 ++++- src/version.c | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/terminal.c b/src/terminal.c index a4120b39c..893cd0f1b 100644 --- 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 index e50eeaf63..a5e02a1a7 100644 --- 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, /**/ -- cgit v1.2.1