Mercurial > vim
changeset 22663:0f90c15a4a28 v8.2.1880
patch 8.2.1880: Vim9: asan complains about adding zero to NULL
Commit: https://github.com/vim/vim/commit/af7a9066a956db23a8bc67bc1f82466e3eff55ea
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Oct 21 16:49:17 2020 +0200
patch 8.2.1880: Vim9: asan complains about adding zero to NULL
Problem: Vim9: Asan complains about adding zero to NULL.
Solution: Check for argument count first.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 21 Oct 2020 17:00:03 +0200 |
| parents | 0f6e0cc4e927 |
| children | 9ce47e3bca78 |
| files | src/version.c src/vim9compile.c |
| diffstat | 2 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1880, +/**/ 1879, /**/ 1878,
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -1475,11 +1475,13 @@ generate_BCALL(cctx_T *cctx, int func_id isn->isn_arg.shuffle.shfl_up = argoff - 1; } - // Check the types of the arguments. - argtypes = ((type_T **)stack->ga_data) + stack->ga_len - argcount; - if (argcount > 0 && internal_func_check_arg_types( - argtypes, func_idx, argcount) == FAIL) + if (argcount > 0) + { + // Check the types of the arguments. + argtypes = ((type_T **)stack->ga_data) + stack->ga_len - argcount; + if (internal_func_check_arg_types(argtypes, func_idx, argcount) == FAIL) return FAIL; + } if ((isn = generate_instr(cctx, ISN_BCALL)) == NULL) return FAIL;