# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1592334005 -7200
# Node ID 88cec48503b8f84f18fec17b1ed839699de102c0
# Parent  cc48460d0b8f02a7fc57a84cbb1dedfe513e8536
patch 8.2.0989: crash after resizing a terminal window

Commit: https://github.com/vim/vim/commit/a6e8bf2d8929ef52eeda495e0e0c3d2bff8f5830
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Jun 16 20:58:07 2020 +0200

    patch 8.2.0989: crash after resizing a terminal window

    Problem:    Crash after resizing a terminal window. (August Masquelier)
    Solution:   Add check for valid row in libvterm. (closes https://github.com/vim/vim/issues/6273)

diff --git a/src/libvterm/src/screen.c b/src/libvterm/src/screen.c
--- a/src/libvterm/src/screen.c
+++ b/src/libvterm/src/screen.c
@@ -280,6 +280,12 @@ static int erase_internal(VTermRect rect
     for(col = rect.start_col; col < rect.end_col; col++) {
       ScreenCell *cell = getcell(screen, row, col);
 
+      if (cell == NULL)
+      {
+        DEBUG_LOG2("libvterm: erase_internal() position invalid: %d / %d",
+								     row, col);
+	return 1;
+      }
       if(selective && cell->pen.protected_cell)
         continue;
 
diff --git a/src/libvterm/src/state.c b/src/libvterm/src/state.c
--- a/src/libvterm/src/state.c
+++ b/src/libvterm/src/state.c
@@ -16,6 +16,12 @@ static int on_resize(int rows, int cols,
 static void putglyph(VTermState *state, const uint32_t chars[], int width, VTermPos pos)
 {
   VTermGlyphInfo info;
+
+  if (pos.row >= state->rows)
+  {
+    DEBUG_LOG2("libvterm: putglyph() pos.row %d out of range (rows = %d)\n", pos.row, state.rows);
+    return;
+  }
   info.chars = chars;
   info.width = width;
   info.protected_cell = state->protected_cell;
@@ -283,6 +289,11 @@ static int on_text(const char bytes[], s
 
   VTermPos oldpos = state->pos;
 
+  if (state->pos.row >= state->rows)
+  {
+    DEBUG_LOG2("libvterm: on_text() pos.row %d out of range (rows = %d)\n", state->pos.row, state.rows);
+    return 0;
+  }
   // We'll have at most len codepoints, plus one from a previous incomplete
   // sequence.
   codepoints = vterm_allocator_malloc(state->vt, (len + 1) * sizeof(uint32_t));
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    989,
+/**/
     988,
 /**/
     987,