patch 7.4.1682

Problem:    Coverity: no check for NULL.
Solution:   Add check for invalid argument to assert_match().

diff --git a/src/eval.c b/src/eval.c
index 1516fe596c8c75a78eec1ee1f9cf78c841289813..0784215932154c852d5fe242ce0e794831ea543a 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -9580,7 +9580,9 @@ f_assert_match(typval_T *argvars, typval_T *rettv UNUSED)
     char_u     *pat = get_tv_string_buf_chk(&argvars[0], buf1);
     char_u     *text = get_tv_string_buf_chk(&argvars[1], buf2);
 
-    if (!pattern_match(pat, text, FALSE))
+    if (pat == NULL || text == NULL)
+       EMSG(_(e_invarg));
+    else if (!pattern_match(pat, text, FALSE))
     {
        prepare_assert_error(&ga);
        fill_assert_error(&ga, &argvars[2], NULL, &argvars[0], &argvars[1],

diff --git a/src/version.c b/src/version.c
index 26928e95b13e2f1d3ead319e2a3653ca43fb3af3..00e25e9014b79c6005bd32b409a2b1a16329b798 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1682,
 /**/
     1681,
 /**/