patch 9.0.0213: using freed memory with error in assert argument

Problem:    Using freed memory with error in assert argument.
Solution:   Make a copy of the error.

diff --git a/src/testdir/test_assert.vim b/src/testdir/test_assert.vim
index 27b2d73fbfc80f9185941848de08a0706258ff9b..7c9d090b39df6f79b1428dea16cb67b207dd838b 100644 (file)
--- 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 f2355f5dac131ae02549b57f38e353beef4a2603..21eb9c18e6e2865b2638756ee89129dab2446c2f 100644 (file)
--- 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 7de71581568e7c3da0212299347d0f07930b6b7b..ec63c24b06f8b3e477f5bf6f1e5cdf8c3f908b47 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    213,
 /**/
     212,
 /**/