forked from aniani/vim
patch 8.2.2078: illegal memory access when using :print on invalid text
Problem: Illegal memory access when using :print on invalid text. (Dhiraj Mishra) Solution: Check for more composing characters than supported. (closes #7399)
This commit is contained in:
parent
a452b808b4
commit
1cbfc9914d
@ -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))
|
||||
{
|
||||
|
@ -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
|
||||
|
@ -750,6 +750,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
2078,
|
||||
/**/
|
||||
2077,
|
||||
/**/
|
||||
|
Loading…
x
Reference in New Issue
Block a user