# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1459198805 -7200
# Node ID 33f5732d893249d08bc4a63da733f1c356eef333
# Parent  687f048755f30212b1114913ce4b899ade6d800c
commit https://github.com/vim/vim/commit/72188e9aae26e6191c68ff673ef145104b17c64f
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Mar 28 22:48:29 2016 +0200

    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
--- a/src/eval.c
+++ b/src/eval.c
@@ -9580,7 +9580,9 @@ f_assert_match(typval_T *argvars, typval
     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
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1682,
+/**/
     1681,
 /**/
     1680,