summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-12-19 12:18:09 +0000
committerBram Moolenaar <Bram@vim.org>2022-12-19 12:18:09 +0000
commit8efdcee02ed02cf9e51e1757441715c2479757ee (patch)
treec0003310ca868391507b4165d0f6e1f944ac78bf
parentc336ae3ce60a2f047b72344ac827568606c5aa15 (diff)
patch 9.0.1076: ASAN complains about NULL argumentv9.0.1076
Problem: ASAN complains about NULL argument. Solution: Skip memmove() when there is nothing to move.
-rw-r--r--src/version.c2
-rw-r--r--src/vim9class.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c
index a734f555d0..f1a34b5e46 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1076,
+/**/
1075,
/**/
1074,
diff --git a/src/vim9class.c b/src/vim9class.c
index 4a97585819..a91a4a5d5c 100644
--- a/src/vim9class.c
+++ b/src/vim9class.c
@@ -164,7 +164,8 @@ add_members_to_class(
*members = gap->ga_len == 0 ? NULL : ALLOC_MULT(ocmember_T, gap->ga_len);
if (gap->ga_len > 0 && *members == NULL)
return FAIL;
- mch_memmove(*members, gap->ga_data, sizeof(ocmember_T) * gap->ga_len);
+ if (gap->ga_len > 0)
+ mch_memmove(*members, gap->ga_data, sizeof(ocmember_T) * gap->ga_len);
VIM_CLEAR(gap->ga_data);
return OK;
}