diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-25 22:20:27 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-25 22:20:27 +0100 |
| commit | 7465c6375fd60eab603681bcad8a8744ddc31614 (patch) | |
| tree | 0f4a223c52dbefd5a05f7a41df16ca1f1cd4542f | |
| parent | f4f79b84a5595c511f6fdbe4e3e1d188d97879a0 (diff) | |
patch 7.4.1180v7.4.1180
Problem: Crash with invalid argument to glob2regpat().
Solution: Check for NULL. (Justin M. Keyes, closes #596) Add a test.
| -rw-r--r-- | src/eval.c | 3 | ||||
| -rw-r--r-- | src/testdir/test_alot.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index 359956be1a..590834fe4a 100644 --- a/src/eval.c +++ b/src/eval.c @@ -12993,7 +12993,8 @@ f_glob2regpat(argvars, rettv) char_u *pat = get_tv_string_chk(&argvars[0]); rettv->v_type = VAR_STRING; - rettv->vval.v_string = file_pat_to_reg_pat(pat, NULL, NULL, FALSE); + rettv->vval.v_string = (pat == NULL) + ? NULL : file_pat_to_reg_pat(pat, NULL, NULL, FALSE); } /* diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim index aceb073f69..97454335de 100644 --- a/src/testdir/test_alot.vim +++ b/src/testdir/test_alot.vim @@ -5,6 +5,7 @@ source test_backspace_opt.vim source test_cursor_func.vim source test_delete.vim source test_expand.vim +source test_glob2regpat.vim source test_json.vim source test_lispwords.vim source test_menu.vim diff --git a/src/version.c b/src/version.c index 073f551dd1..ee6ac48c4b 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1180, +/**/ 1179, /**/ 1178, |