From 48824e952f7db8ca657fe20e66456fc19fca6815 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 4 Jan 2022 16:05:48 +0000 Subject: [PATCH] patch 8.2.3998: asan error for adding zero to NULL Problem: Asan error for adding zero to NULL. Solution: Do not compute pointer if there are no entries. --- src/version.c | 2 ++ src/vim9type.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/version.c b/src/version.c index 170c0c2e6..4f40aab7a 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 */ +/**/ + 3998, /**/ 3997, /**/ diff --git a/src/vim9type.c b/src/vim9type.c index f2ed15b48..f28b88f23 100644 --- a/src/vim9type.c +++ b/src/vim9type.c @@ -1267,7 +1267,7 @@ get_member_type_from_stack( cctx_T *cctx) { garray_T *stack = &cctx->ctx_type_stack; - type2_T *typep = ((type2_T *)stack->ga_data) + stack->ga_len; + type2_T *typep; garray_T *type_gap = cctx->ctx_type_list; int i; type_T *result; @@ -1283,6 +1283,7 @@ get_member_type_from_stack( // Use the first value type for the list member type, then find the common // type from following items. + typep = ((type2_T *)stack->ga_data) + stack->ga_len; result = (typep -(count * skip) + skip - 1)->type_curr; decl_result = (typep -(count * skip) + skip - 1)->type_decl; for (i = 1; i < count; ++i) -- 2.40.0