aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 9.0.0220: invalid memory access with for loop over NULL string

Browse Source 
Problem:    Invalid memory access with for loop over NULL string.
Solution:   Make sure mb_ptr2len() consistently returns zero for NUL.
This commit is contained in:
Bram Moolenaar
2022-08-16 17:50:38 +01:00
parent 948a3894d9
commit f6d39c31d2
4 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/mbyte.c
View File

@@ -1077,24 +1077,28 @@ dbcs_char2bytes(int c, char_u *buf)
}
/*
* mb_ptr2len() function pointer.
* Get byte length of character at "*p" but stop at a NUL.
* For UTF-8 this includes following composing characters.
* Returns 0 when *p is NUL.
* Get byte length of character at "*p". Returns zero when "*p" is NUL.
* Used for mb_ptr2len() when 'encoding' latin.
*/
int
latin_ptr2len(char_u *p)
{
return MB_BYTE2LEN(*p);
return *p == NUL ? 0 : 1;
}
/*
* Get byte length of character at "*p". Returns zero when "*p" is NUL.
* Used for mb_ptr2len() when 'encoding' DBCS.
*/
static int
dbcs_ptr2len(
char_u *p)
dbcs_ptr2len(char_u *p)
{
int len;
// Check if second byte is not missing.
if (*p == NUL)
return 0;
// if the second byte is missing the length is 1
len = MB_BYTE2LEN(*p);
if (len == 2 && p[1] == NUL)
len = 1;
@@ -2105,6 +2109,7 @@ utf_ptr2len_len(char_u *p, int size)
/*
* Return the number of bytes the UTF-8 encoding of the character at "p" takes.
* This includes following composing characters.
* Returns zero for NUL.
*/
int
utfc_ptr2len(char_u *p)