diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-12-02 12:37:37 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-12-02 12:37:37 +0100 |
| commit | 1cbfc9914db1cb06aaa092fa42eb7a2fc3dc7ad7 (patch) | |
| tree | 2d006290346b32cd411080d3087a84d8a49e08b6 | |
| parent | a452b808b4da2d272ca4a50865eb8ca89a58f239 (diff) | |
| download | vim-git-1cbfc9914db1cb06aaa092fa42eb7a2fc3dc7ad7.tar.gz | |
patch 8.2.2078: illegal memory access when using :print on invalid textv8.2.2078
Problem: Illegal memory access when using :print on invalid text. (Dhiraj
Mishra)
Solution: Check for more composing characters than supported. (closes #7399)
| -rw-r--r-- | src/message.c | 6 | ||||
| -rw-r--r-- | src/testdir/test_utf8.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/message.c b/src/message.c index f8efabc80..3f6d56e5d 100644 --- a/src/message.c +++ b/src/message.c @@ -1859,7 +1859,11 @@ msg_prt_line(char_u *s, int list) else if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) { col += (*mb_ptr2cells)(s); - if (lcs_nbsp != NUL && list + if (l >= MB_MAXBYTES) + { + STRCPY(buf, "¿"); + } + else if (lcs_nbsp != NUL && list && (mb_ptr2char(s) == 160 || mb_ptr2char(s) == 0x202f)) { diff --git a/src/testdir/test_utf8.vim b/src/testdir/test_utf8.vim index bfb90c108..a5fd4fb89 100644 --- a/src/testdir/test_utf8.vim +++ b/src/testdir/test_utf8.vim @@ -180,4 +180,13 @@ func Test_setcellwidths() call assert_fails('call setcellwidths([[0x33, 0x44, 2]])', 'E1114:') endfunc +func Test_print_overlong() + " Text with more composing characters than MB_MAXBYTES. + new + call setline(1, 'axxxxxxxxxxxxxxxxxxxxxxxxxxxxxx') + s/x/\=nr2char(1629)/g + print + bwipe! +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 9234d390b..2eb5de5fc 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2078, +/**/ 2077, /**/ 2076, |