Mercurial > vim
changeset 17696:03dcb660c4e8 v8.1.1845
patch 8.1.1845: may use NULL pointer when running out of memory
commit https://github.com/vim/vim/commit/6ace95e9810bdfef5392ad89efc9e4ad4606de28
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Aug 13 23:09:49 2019 +0200
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 https://github.com/vim/vim/issues/4802)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 13 Aug 2019 23:15:05 +0200 |
| parents | f06c184d5a5f |
| children | 1d0133ac3c3b |
| files | src/screen.c src/version.c |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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