forked from aniani/vim
patch 9.0.0404: crash when passing invalid arguments to assert_fails()
Problem: Crash when passing invalid arguments to assert_fails(). Solution: Check for NULL string.
This commit is contained in:
@@ -616,6 +616,11 @@ f_assert_fails(typval_T *argvars, typval_T *rettv)
|
||||
in_assert_fails = TRUE;
|
||||
|
||||
do_cmdline_cmd(cmd);
|
||||
|
||||
// reset here for any errors reported below
|
||||
trylevel = save_trylevel;
|
||||
suppress_errthrow = FALSE;
|
||||
|
||||
if (called_emsg == called_emsg_before)
|
||||
{
|
||||
prepare_assert_error(&ga);
|
||||
@@ -654,6 +659,8 @@ f_assert_fails(typval_T *argvars, typval_T *rettv)
|
||||
CHECK_LIST_MATERIALIZE(list);
|
||||
tv = &list->lv_first->li_tv;
|
||||
expected = tv_get_string_buf_chk(tv, buf);
|
||||
if (expected == NULL)
|
||||
goto theend;
|
||||
if (!pattern_match(expected, actual, FALSE))
|
||||
{
|
||||
error_found = TRUE;
|
||||
@@ -667,6 +674,8 @@ f_assert_fails(typval_T *argvars, typval_T *rettv)
|
||||
{
|
||||
tv = &list->lv_u.mat.lv_last->li_tv;
|
||||
expected = tv_get_string_buf_chk(tv, buf);
|
||||
if (expected == NULL)
|
||||
goto theend;
|
||||
if (!pattern_match(expected, actual, FALSE))
|
||||
{
|
||||
error_found = TRUE;
|
||||
|
Reference in New Issue
Block a user