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

patch 8.0.1468: illegal memory access in del_bytes()

Browse Source 
Problem:    Illegal memory access in del_bytes().
Solution:   Check for negative byte count. (Christian Brabandt, closes #2466)
This commit is contained in:
Bram Moolenaar
2018-02-04 16:38:47 +01:00
parent fef4ddd5eb
commit 191f18bad0
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/misc1.c
View File

@@ -2457,7 +2457,7 @@ del_chars(long count, int fixpos)
* If "fixpos" is TRUE, don't leave the cursor on the NUL after the line.
* Caller must have prepared for undo.
*
* return FAIL for failure, OK otherwise
* Return FAIL for failure, OK otherwise.
*/
int
del_bytes(
@@ -2476,12 +2476,21 @@ del_bytes(
oldp = ml_get(lnum);
oldlen = (int)STRLEN(oldp);
/*
* Can't do anything when the cursor is on the NUL after the line.
*/
/* Can't do anything when the cursor is on the NUL after the line. */
if (col >= oldlen)
return FAIL;
/* If "count" is zero there is nothing to do. */
if (count == 0)
return OK;
/* If "count" is negative the caller must be doing something wrong. */
if (count < 1)
{
IEMSGN("E950: Invalid count for del_bytes(): %ld", count);
return FAIL;
}
#ifdef FEAT_MBYTE
/* If 'delcombine' is set and deleting (less than) one character, only
* delete the last combining character. */