diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-08-14 22:23:02 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-08-14 22:23:02 +0100 |
| commit | 249e1b903a9c0460d618f6dcc59aeb8c03b24b20 (patch) | |
| tree | 77110ae4e3e3fe155aa92e670f0f4a8315761bc4 | |
| parent | dbdd16b62560413abcc3c8e893cc3010ccf31666 (diff) | |
| download | vim-git-249e1b903a9c0460d618f6dcc59aeb8c03b24b20.tar.gz | |
patch 9.0.0213: using freed memory with error in assert argumentv9.0.0213
Problem: Using freed memory with error in assert argument.
Solution: Make a copy of the error.
| -rw-r--r-- | src/testdir/test_assert.vim | 4 | ||||
| -rw-r--r-- | src/testing.c | 18 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 18 insertions, 6 deletions
diff --git a/src/testdir/test_assert.vim b/src/testdir/test_assert.vim index 27b2d73fb..7c9d090b3 100644 --- a/src/testdir/test_assert.vim +++ b/src/testdir/test_assert.vim @@ -291,6 +291,10 @@ func Test_assert_fail_fails() let exp = v:exception 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 remove(v:errors, 0) endfunc func Test_assert_fails_in_try_block() diff --git a/src/testing.c b/src/testing.c index f2355f5da..21eb9c18e 100644 --- a/src/testing.c +++ b/src/testing.c @@ -597,6 +597,7 @@ f_assert_fails(typval_T *argvars, typval_T *rettv) int save_trylevel = trylevel; int called_emsg_before = called_emsg; char *wrong_arg_msg = NULL; + char_u *tofree = NULL; if (check_for_string_or_number_arg(argvars, 0) == FAIL || check_for_opt_string_or_list_arg(argvars, 1) == FAIL @@ -660,13 +661,17 @@ f_assert_fails(typval_T *argvars, typval_T *rettv) } else if (list->lv_len == 2) { - tv = &list->lv_u.mat.lv_last->li_tv; - actual = get_vim_var_str(VV_ERRMSG); - expected = tv_get_string_buf_chk(tv, buf); - if (!pattern_match(expected, actual, FALSE)) + // make a copy, an error in pattern_match() may free it + tofree = actual = vim_strsave(get_vim_var_str(VV_ERRMSG)); + if (actual != NULL) { - error_found = TRUE; - expected_str = expected; + tv = &list->lv_u.mat.lv_last->li_tv; + expected = tv_get_string_buf_chk(tv, buf); + if (!pattern_match(expected, actual, FALSE)) + { + error_found = TRUE; + expected_str = expected; + } } } } @@ -749,6 +754,7 @@ theend: msg_scrolled = 0; lines_left = Rows; VIM_CLEAR(emsg_assert_fails_msg); + vim_free(tofree); set_vim_var_string(VV_ERRMSG, NULL, 0); if (wrong_arg_msg != NULL) emsg(_(wrong_arg_msg)); diff --git a/src/version.c b/src/version.c index 7de715815..ec63c24b0 100644 --- a/src/version.c +++ b/src/version.c @@ -736,6 +736,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 213, +/**/ 212, /**/ 211, |