commit 72188e9aae26e6191c68ff673ef145104b17c64f
author Bram Moolenaar <Bram@vim.org> Mon Mar 28 22:48:29 2016 +0200
committer Bram Moolenaar <Bram@vim.org> Mon Mar 28 22:48:29 2016 +0200
tree 535bd0d47a11a2dc0509c777f66d2ed56d66945f
parent ef9d9b94a8803c405884bb6914ed745ede57c596

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

src/eval.c

diff --git a/src/eval.c b/src/eval.c
index 1516fe5..0784215 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -9580,7 +9580,9 @@
     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],

src/version.c

diff --git a/src/version.c b/src/version.c
index 26928e9..00e25e9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1682,
+/**/
     1681,
 /**/
     1680,