aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.2779: memory access error in remove() for blob

Browse Source 
Problem:    Memory access error in remove() for blob.
Solution:   Adjust length for memmove().
This commit is contained in:
Bram Moolenaar
2021-04-17 21:22:49 +02:00
parent d23b714d8b
commit f7e92aae15
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blob.c
View File

@@ -444,7 +444,7 @@ blob_remove(typval_T *argvars, typval_T *rettv)
{ {
blob_T *blob; blob_T *blob;
// Remove range of items, return list with values. // Remove range of items, return blob with values.
end = (long)tv_get_number_chk(&argvars[2], &error); end = (long)tv_get_number_chk(&argvars[2], &error);
if (error) if (error)
return; return;
@@ -472,7 +472,8 @@ blob_remove(typval_T *argvars, typval_T *rettv)
rettv->v_type = VAR_BLOB; rettv->v_type = VAR_BLOB;
rettv->vval.v_blob = blob; rettv->vval.v_blob = blob;
mch_memmove(p + idx, p + end + 1, (size_t)(len - end)); if (len - end - 1 > 0)
mch_memmove(p + idx, p + end + 1, (size_t)(len - end - 1));
b->bv_ga.ga_len -= end - idx + 1; b->bv_ga.ga_len -= end - idx + 1;
} }
} }

2
src/version.c
View File

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