aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.1201: Vim9: crash when passing number as dict key

Browse Source 
Problem:    Vim9: crash when passing number as dict key.
Solution:   Check key type to be string. (closes #6449)
This commit is contained in:
Bram Moolenaar
2020-07-13 18:55:48 +02:00
parent bfd65589d9
commit f1a2368d81
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vim9compile.c
View File

@@ -3212,6 +3212,7 @@ compile_lambda_call(char_u **arg, cctx_T *cctx)
compile_dict(char_u **arg, cctx_T *cctx, int literal)
{
garray_T *instr = &cctx->ctx_instr;
garray_T *stack = &cctx->ctx_type_stack;
int count = 0;
dict_T *d = dict_alloc();
dictitem_T *item;
@@ -3254,10 +3255,16 @@ compile_dict(char_u **arg, cctx_T *cctx, int literal)
if (compile_expr0(arg, cctx) == FAIL)
return FAIL;
// TODO: check type is string
isn = ((isn_T *)instr->ga_data) + instr->ga_len - 1;
if (isn->isn_type == ISN_PUSHS)
key = isn->isn_arg.string;
else
{
type_T *keytype = ((type_T **)stack->ga_data)
[stack->ga_len - 1];
if (need_type(keytype, &t_string, -1, cctx, FALSE) == FAIL)
return FAIL;
}
}
// Check for duplicate keys, if using string keys.