From 8efdcee02ed02cf9e51e1757441715c2479757ee Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 19 Dec 2022 12:18:09 +0000 Subject: [PATCH] patch 9.0.1076: ASAN complains about NULL argument Problem: ASAN complains about NULL argument. Solution: Skip memmove() when there is nothing to move. --- src/version.c | 2 ++ src/vim9class.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/version.c b/src/version.c index a734f555d07b3..f1a34b5e4673e 100644 --- a/src/version.c +++ b/src/version.c @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1076, /**/ 1075, /**/ diff --git a/src/vim9class.c b/src/vim9class.c index 4a975858190a5..a91a4a5d5c92d 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; }