From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 17 Apr 2021 19:22:49 +0000 (+0200)
Subject: patch 8.2.2779: memory access error in remove() for blob
X-Git-Tag: v8.2.2779
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f7e92aae1581203306a340b4c0059cc74adea9d6;p=vim

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

Problem:    Memory access error in remove() for blob.
Solution:   Adjust length for memmove().
---

diff --git a/src/blob.c b/src/blob.c
index 9f5977707..4685dc97c 100644
--- a/src/blob.c
+++ b/src/blob.c
@@ -444,7 +444,7 @@ blob_remove(typval_T *argvars, typval_T *rettv)
 	{
 	    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);
 	    if (error)
 		return;
@@ -472,7 +472,8 @@ blob_remove(typval_T *argvars, typval_T *rettv)
 	    rettv->v_type = VAR_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;
 	}
     }
diff --git a/src/version.c b/src/version.c
index 83d7e5725..12a51c912 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2779,
 /**/
     2778,
 /**/