thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.2.3998: asan error for adding zero to NULL

Browse Source 
Problem:    Asan error for adding zero to NULL.
Solution:   Do not compute pointer if there are no entries.
This commit is contained in:
Bram Moolenaar 2022-01-04 16:05:48 +00:00
parent 10d6f18b2f
commit 48824e952f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 */
/**/
3998,
/**/ /**/
3997, 3997,
/**/ /**/

3
src/vim9type.c
View File

@ -1267,7 +1267,7 @@ get_member_type_from_stack(
cctx_T *cctx) cctx_T *cctx)
{ {
garray_T *stack = &cctx->ctx_type_stack; 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; garray_T *type_gap = cctx->ctx_type_list;
int i; int i;
type_T *result; 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 // Use the first value type for the list member type, then find the common
// type from following items. // type from following items.
typep = ((type2_T *)stack->ga_data) + stack->ga_len;
result = (typep -(count * skip) + skip - 1)->type_curr; result = (typep -(count * skip) + skip - 1)->type_curr;
decl_result = (typep -(count * skip) + skip - 1)->type_decl; decl_result = (typep -(count * skip) + skip - 1)->type_decl;
for (i = 1; i < count; ++i) for (i = 1; i < count; ++i)