patch 8.0.1317: accessing freed memory in term_wait()

Problem:    Accessing freed memory in term_wait(). (Dominique Pelle)
Solution:   Check that the buffer still exists.

diff --git a/src/terminal.c b/src/terminal.c
index 6cbe3433ff4804c96f112f9f7b17382dc6181663..f1b4313ad8582e6aaf1d00a868fb45a9553b8f1c 100644 (file)
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -3227,6 +3227,10 @@ f_term_wait(typval_T *argvars, typval_T *rettv UNUSED)
        {
            mch_check_messages();
            parse_queued_messages();
+           if (!buf_valid(buf))
+               /* If the terminal is closed when the channel is closed the
+                * buffer disappears. */
+               break;
            ui_delay(10L, FALSE);
        }
        mch_check_messages();

diff --git a/src/version.c b/src/version.c
index 99007ac5c35c10cb5271c24d288dcc130276775f..7e03c4b5060c61d264f96c3c10bfaa9e9f8ee25f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1317,
 /**/
     1316,
 /**/