changeset 8787:33f5732d8932 v7.4.1682

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().
author Christian Brabandt <cb@256bit.org>
date Mon, 28 Mar 2016 23:00:05 +0200
parents 687f048755f3
children c29f6fad5319
files src/eval.c src/version.c
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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],
--- 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,