patch 8.2.3915: illegal memory access when completing with invalid bytes

Problem:    illegal memory access when completing with invalid bytes.
Solution:   Avoid going over the end of the completion text.
This commit is contained in:
Bram Moolenaar
2021-12-27 19:28:37 +00:00
parent af4a61a85d
commit 4b28ba3245
3 changed files with 21 additions and 1 deletions

View File

@ -3437,7 +3437,12 @@ ins_compl_delete(void)
void
ins_compl_insert(int in_compl_func)
{
ins_bytes(compl_shown_match->cp_str + ins_compl_len());
int compl_len = ins_compl_len();
// Make sure we don't go over the end of the string, this can happen with
// illegal bytes.
if (compl_len < (int)STRLEN(compl_shown_match->cp_str))
ins_bytes(compl_shown_match->cp_str + compl_len);
if (compl_shown_match->cp_flags & CP_ORIGINAL_TEXT)
compl_used_match = FALSE;
else

View File

@ -103,6 +103,19 @@ func Test_ins_complete()
call delete('Xdir', 'rf')
endfunc
func Test_ins_complete_invalid_byte()
if has('unix') && executable('base64')
" this weird command was causing an illegal memory access
call writefile(['bm9ybTlvMDCAMM4Dbw4OGA4ODg=='], 'Xinvalid64')
call system('base64 -d Xinvalid64 > Xinvalid')
call writefile(['qa!'], 'Xexit')
call RunVim([], [], " -i NONE -n -X -Z -e -m -s -S Xinvalid -S Xexit")
call delete('Xinvalid64')
call delete('Xinvalid')
call delete('Xexit')
endif
endfunc
func Test_omni_dash()
func Omni(findstart, base)
if a:findstart

View File

@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
3915,
/**/
3914,
/**/