diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-28 22:48:29 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-28 22:48:29 +0200 |
| commit | 72188e9aae26e6191c68ff673ef145104b17c64f (patch) | |
| tree | 535bd0d47a11a2dc0509c777f66d2ed56d66945f | |
| parent | ef9d9b94a8803c405884bb6914ed745ede57c596 (diff) | |
patch 7.4.1682v7.4.1682
Problem: Coverity: no check for NULL.
Solution: Add check for invalid argument to assert_match().
| -rw-r--r-- | src/eval.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index 1516fe596c..0784215932 100644 --- 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 26928e95b1..00e25e9014 100644 --- 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, |