From 6ace95e9810bdfef5392ad89efc9e4ad4606de28 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 13 Aug 2019 23:09:49 +0200 Subject: [PATCH] patch 8.1.1845: may use NULL pointer when running out of memory Problem: May use NULL pointer when running out of memory. Solution: Do not clear popup buffers when NULL. (closes #4802) --- src/screen.c | 8 ++++++-- src/version.c | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/screen.c b/src/screen.c index 55437e1476..72b346d96d 100644 --- a/src/screen.c +++ b/src/screen.c @@ -8645,10 +8645,16 @@ give_up: } /* Use the last line of the screen for the current line. */ current_ScreenLine = new_ScreenLines + Rows * Columns; + +#ifdef FEAT_TEXT_PROP + vim_memset(new_popup_mask, 0, Rows * Columns * sizeof(short)); + vim_memset(new_popup_transparent, 0, Rows * Columns * sizeof(char)); +#endif } free_screenlines(); + // NOTE: this may result in all pointers to become NULL. ScreenLines = new_ScreenLines; ScreenLinesUC = new_ScreenLinesUC; for (i = 0; i < p_mco; ++i) @@ -8661,10 +8667,8 @@ give_up: TabPageIdxs = new_TabPageIdxs; #ifdef FEAT_TEXT_PROP popup_mask = new_popup_mask; - vim_memset(popup_mask, 0, Rows * Columns * sizeof(short)); popup_mask_next = new_popup_mask_next; popup_transparent = new_popup_transparent; - vim_memset(popup_transparent, 0, Rows * Columns * sizeof(char)); popup_mask_refresh = TRUE; #endif diff --git a/src/version.c b/src/version.c index f998c52586..71f6c34f38 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 */ +/**/ + 1845, /**/ 1844, /**/