Skip to content

Commit

Permalink
patch 9.0.0404: crash when passing invalid arguments to assert_fails()
Browse files Browse the repository at this point in the history
Problem:    Crash when passing invalid arguments to assert_fails().
Solution:   Check for NULL string.
  • Loading branch information
brammool committed Sep 7, 2022
1 parent fd7e60a commit 1540d33
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 2 deletions.
19 changes: 17 additions & 2 deletions src/testdir/test_assert.vim
Expand Up @@ -275,6 +275,21 @@ func Test_assert_fail_fails()
endtry
call assert_match("E1222: String or List required for argument 2", exp)

try
call assert_equal(0, assert_fails('xxx', [#{one: 1}]))
catch
let exp = v:exception
endtry
call assert_match("E731: Using a Dictionary as a String", exp)

let exp = ''
try
call assert_equal(0, assert_fails('xxx', ['E492', #{one: 1}]))
catch
let exp = v:exception
endtry
call assert_match("E731: Using a Dictionary as a String", exp)

try
call assert_equal(1, assert_fails('xxx', 'E492', '', 'burp'))
catch
Expand All @@ -289,8 +304,8 @@ func Test_assert_fail_fails()
endtry
call assert_match("E1174: String required for argument 5", exp)

call assert_equal(1, assert_fails('c0', ['', '\1']))
call assert_match("Expected '\\\\\\\\1' but got 'E939: Positive count required: c0': c0", v:errors[0])
call assert_equal(1, assert_fails('c0', ['', '\(.\)\1']))
call assert_match("Expected '\\\\\\\\(.\\\\\\\\)\\\\\\\\1' but got 'E939: Positive count required: c0': c0", v:errors[0])
call remove(v:errors, 0)
endfunc

Expand Down
9 changes: 9 additions & 0 deletions src/testing.c
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -703,6 +703,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
404,
/**/
403,
/**/
Expand Down

0 comments on commit 1540d33

Please sign in to comment.