summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-06-08 16:55:15 +0200
committerBram Moolenaar <Bram@vim.org>2019-06-08 16:55:15 +0200
commit1748c7f77ea864c669b7e5cfb2be0c34ce45e36e (patch)
treef591c6ed6a72288b625dc30123cc42eeffbe65d9
parent6c009a39744b49393464567266a3fa3562f08ee2 (diff)
downloadvim-git-1748c7f77ea864c669b7e5cfb2be0c34ce45e36e.tar.gz
patch 8.1.1495: memory access errorv8.1.1495
Problem: Memory access error. Solution: Use the correct size for clearing the popup mask.
-rw-r--r--src/screen.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c
index fb1085327..512560b88 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 ed8fba056..504a1631c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1495,
+/**/
1494,
/**/
1493,