From 1748c7f77ea864c669b7e5cfb2be0c34ce45e36e Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 8 Jun 2019 16:55:15 +0200
Subject: patch 8.1.1495: memory access error

Problem:    Memory access error.
Solution:   Use the correct size for clearing the popup mask.
---
 src/screen.c  | 2 +-
 src/version.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/screen.c b/src/screen.c
index fb10853277..512560b885 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -9345,7 +9345,7 @@ give_up:
     TabPageIdxs = new_TabPageIdxs;
 #ifdef FEAT_TEXT_PROP
     popup_mask = new_popup_mask;
-    vim_memset(popup_mask, 0, screen_Rows * screen_Columns * sizeof(short));
+    vim_memset(popup_mask, 0, Rows * Columns * sizeof(short));
     popup_mask_refresh = TRUE;
 #endif
 
diff --git a/src/version.c b/src/version.c
index ed8fba056e..504a1631c0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1495,
 /**/
     1494,
 /**/
-- 
cgit v1.2.3