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

patch 8.2.1176: Vim9: not enough type checking in Vim9 script

Browse Source 
Problem:    Vim9: not enough type checking in Vim9 script.
Solution:   Use same type checking as in a :def function.
This commit is contained in:
Bram Moolenaar
2020-07-10 22:45:38 +02:00
parent 7ff78465f7
commit 543e6f3467
5 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vim9compile.c
View File

@@ -820,6 +820,14 @@ get_compare_isn(exptype_T exptype, vartype_T type1, vartype_T type2)
return isntype;
}
int
check_compare_types(exptype_T type, typval_T *tv1, typval_T *tv2)
{
if (get_compare_isn(type, tv1->v_type, tv2->v_type) == ISN_DROP)
return FAIL;
return OK;
}
/*
* Generate an ISN_COMPARE* instruction with a boolean result.
*/
@@ -4296,7 +4304,7 @@ compile_expr4(char_u **arg, cctx_T *cctx, ppconst_T *ppconst)
// Both sides are a constant, compute the result now.
// First check for a valid combination of types, this is more
// strict than typval_compare().
if (get_compare_isn(type, tv1->v_type, tv2->v_type) == ISN_DROP)
if (check_compare_types(type, tv1, tv2) == FAIL)
ret = FAIL;
else
{