Mercurial > vim
changeset 36062:db2040131f43 v9.1.0703
patch 9.1.0703: crash with 2byte encoding and glob2regpat()
Commit: https://github.com/vim/vim/commit/c9bfed2fda8c23cc02325b1a7a6d84dc62bbea4b
Author: Christian Brabandt <cb@256bit.org>
Date: Thu Aug 29 22:12:05 2024 +0200
patch 9.1.0703: crash with 2byte encoding and glob2regpat()
Problem: possible crash with 2-byte encoding and glob2regpat()
(after v9.1.0700, v9.1.0702)
Solution: include both bytes for a multi-byte character for an
escaped character
closes: #15590
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 29 Aug 2024 22:30:04 +0200 |
| parents | d0d0a48f54d2 |
| children | a7d9ec0fcd58 |
| files | src/fileio.c src/testdir/test_crash.vim src/version.c |
| diffstat | 3 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/fileio.c +++ b/src/fileio.c @@ -5714,6 +5714,8 @@ file_pat_to_reg_pat( ) *allow_dirs = TRUE; reg_pat[i++] = '\\'; + if (enc_dbcs != 0 && (*mb_ptr2len)(p) > 1) + reg_pat[i++] = *p++; reg_pat[i++] = *p; } break;
--- a/src/testdir/test_crash.vim +++ b/src/testdir/test_crash.vim @@ -222,11 +222,11 @@ func Test_crash1_3() call term_sendkeys(buf, args) call TermWait(buf, 150) - " let file = 'crash/heap_overflow_glob2regpat' - " let cmn_args = "%s -u NONE -i NONE -n -X -m -n -e -s -S %s -c ':qa!'" - " let args = printf(cmn_args, vim, file) - " call term_sendkeys(buf, args) - " call TermWait(buf, 50) + let file = 'crash/heap_overflow_glob2regpat' + let cmn_args = "%s -u NONE -i NONE -n -X -m -n -e -s -S %s -c ':qa!'" + let args = printf(cmn_args, vim, file) + call term_sendkeys(buf, args) + call TermWait(buf, 50) let file = 'crash/nullptr_regexp_nfa' let cmn_args = "%s -u NONE -i NONE -n -X -m -n -e -s -S %s -c ':qa!'"