mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 11:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.4397: crash when using many composing characters in error message (#23481)

Browse Source 
Problem:    Crash when using many composing characters in error message.
Solution:   Use mb_cptr2char_adv() instead of mb_ptr2char_adv().

34f8117dec

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq
2023-05-05 06:22:37 +08:00
committed by GitHub
parent f6299e9d6e
commit d79e726212
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/testing.c
View File

@@ -121,7 +121,7 @@ static void ga_concat_shorten_esc(garray_T *gap, const char *str)
for (const char *p = str; *p != NUL; p++) { for (const char *p = str; *p != NUL; p++) {
int same_len = 1; int same_len = 1;
const char *s = p; const char *s = p;
const int c = mb_ptr2char_adv(&s); const int c = mb_cptr2char_adv(&s);
const int clen = (int)(s - p); const int clen = (int)(s - p);
while (*s != NUL && c == utf_ptr2char(s)) { while (*s != NUL && c == utf_ptr2char(s)) {
same_len++; same_len++;

8
test/old/testdir/test_assert.vim
View File

@@ -53,6 +53,14 @@ func Test_assert_equal()
call assert_equal("\b\e\f\n\t\r\\\x01\x7f", 'x') call assert_equal("\b\e\f\n\t\r\\\x01\x7f", 'x')
call assert_match('Expected ''\\b\\e\\f\\n\\t\\r\\\\\\x01\\x7f'' but got ''x''', v:errors[0]) call assert_match('Expected ''\\b\\e\\f\\n\\t\\r\\\\\\x01\\x7f'' but got ''x''', v:errors[0])
call remove(v:errors, 0) call remove(v:errors, 0)
" many composing characters are handled properly
call setline(1, ' ')
norm 100gr݀
call assert_equal(1, getline(1))
call assert_match("Expected 1 but got '.* occurs 100 times]'", v:errors[0])
call remove(v:errors, 0)
bwipe!
endfunc endfunc
func Test_assert_equal_dict() func Test_assert_equal_dict()