Mercurial > vim
changeset 16994:9c4cf27deb87 v8.1.1497
patch 8.1.1497: accessing memory beyond allocated space
commit https://github.com/vim/vim/commit/aef5c62a6fff7654bb8df7b9359e811f7a6e428f
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jun 8 17:25:33 2019 +0200
patch 8.1.1497: accessing memory beyond allocated space
Problem: Accessing memory beyond allocated space.
Solution: Check column before accessing popup mask.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 08 Jun 2019 17:30:06 +0200 |
| parents | 0f93d3f72217 |
| children | 6664cc1a0af4 |
| files | src/screen.c src/version.c |
| diffstat | 2 files changed, 28 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/screen.c +++ b/src/screen.c @@ -6797,35 +6797,40 @@ screen_line( if (clear_width > 0 #ifdef FEAT_TEXT_PROP && !(flags & SLF_POPUP) // no separator for popup window - && popup_mask[row * screen_Columns + col + coloff] <= screen_zindex #endif ) { // For a window that has a right neighbor, draw the separator char - // right of the window contents. + // right of the window contents. But not on top of a popup window. if (coloff + col < Columns) { - int c; - - c = fillchar_vsep(&hl); - if (ScreenLines[off_to] != (schar_T)c - || (enc_utf8 && (int)ScreenLinesUC[off_to] - != (c >= 0x80 ? c : 0)) - || ScreenAttrs[off_to] != hl) - { - ScreenLines[off_to] = c; - ScreenAttrs[off_to] = hl; - if (enc_utf8) - { - if (c >= 0x80) +#ifdef FEAT_TEXT_PROP + if (popup_mask[row * screen_Columns + col + coloff] + <= screen_zindex) +#endif + { + int c; + + c = fillchar_vsep(&hl); + if (ScreenLines[off_to] != (schar_T)c + || (enc_utf8 && (int)ScreenLinesUC[off_to] + != (c >= 0x80 ? c : 0)) + || ScreenAttrs[off_to] != hl) + { + ScreenLines[off_to] = c; + ScreenAttrs[off_to] = hl; + if (enc_utf8) { - ScreenLinesUC[off_to] = c; - ScreenLinesC[0][off_to] = 0; + if (c >= 0x80) + { + ScreenLinesUC[off_to] = c; + ScreenLinesC[0][off_to] = 0; + } + else + ScreenLinesUC[off_to] = 0; } - else - ScreenLinesUC[off_to] = 0; - } - screen_char(off_to, row, col + coloff); + screen_char(off_to, row, col + coloff); + } } } else