thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.1.2119: memory access error for empty string

Browse Source 
Problem:    memory access error for empty string when 'encoding' is a single
            byte encoding.
Solution:   Check for empty string when getting the length. (Dominique Pelle,
            closes #5021, closes #5007)
This commit is contained in:
Bram Moolenaar 2019-10-06 20:08:38 +02:00
parent eb66328bd7
commit 524f3b19ae
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/macros.h
View File

@ -230,11 +230,11 @@
* PTR2CHAR(): get character from pointer.
*/
/* Get the length of the character p points to, including composing chars */
#define MB_PTR2LEN(p) (has_mbyte ? (*mb_ptr2len)(p) : 1)
#define MB_PTR2LEN(p) (has_mbyte ? (*mb_ptr2len)(p) : (*p == NUL ? 0 : 1))
/* Advance multi-byte pointer, skip over composing chars. */
#define MB_PTR_ADV(p) p += has_mbyte ? (*mb_ptr2len)(p) : 1
#define MB_PTR_ADV(p) p += has_mbyte ? (*mb_ptr2len)(p) : (*p == NUL ? 0 : 1)
/* Advance multi-byte pointer, do not skip over composing chars. */
#define MB_CPTR_ADV(p) p += enc_utf8 ? utf_ptr2len(p) : has_mbyte ? (*mb_ptr2len)(p) : 1
#define MB_CPTR_ADV(p) p += enc_utf8 ? utf_ptr2len(p) : has_mbyte ? (*mb_ptr2len)(p) : (*p == NUL ? 0 : 1)
/* Backup multi-byte pointer. Only use with "p" > "s" ! */
#define MB_PTR_BACK(s, p) p -= has_mbyte ? ((*mb_head_off)(s, p - 1) + 1) : 1
/* get length of multi-byte char, not including composing chars */

2
src/version.c
View File

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