commit 7465c6375fd60eab603681bcad8a8744ddc31614
author Bram Moolenaar <Bram@vim.org> Mon Jan 25 22:20:27 2016 +0100
committer Bram Moolenaar <Bram@vim.org> Mon Jan 25 22:20:27 2016 +0100
tree 0f4a223c52dbefd5a05f7a41df16ca1f1cd4542f
parent f4f79b84a5595c511f6fdbe4e3e1d188d97879a0

patch 7.4.1180
Problem:    Crash with invalid argument to glob2regpat().
Solution:   Check for NULL. (Justin M. Keyes, closes #596)  Add a test.

src/eval.c

diff --git a/src/eval.c b/src/eval.c
index 359956b..590834f 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -12993,7 +12993,8 @@
     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);
 }
 
 /*

src/testdir/test_alot.vim

diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim
index aceb073..9745433 100644
--- a/src/testdir/test_alot.vim
+++ b/src/testdir/test_alot.vim
@@ -5,6 +5,7 @@
 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

src/version.c

diff --git a/src/version.c b/src/version.c
index 073f551..ee6ac48 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1180,
+/**/
     1179,
 /**/
     1178,