From db77b7bc9e510f790064333473abde98e0284af1 Mon Sep 17 00:00:00 2001 From: oni-link Date: Thu, 28 Jan 2016 00:45:26 -0500 Subject: file_pat_to_reg_pat(): handle empty string. --- src/nvim/eval.c | 2 +- src/nvim/fileio.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 25f3cbf180..33c584eede 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -10792,7 +10792,7 @@ static void f_glob2regpat(typval_T *argvars, typval_T *rettv) char_u *pat = get_tv_string_chk(&argvars[0]); // NULL on type error rettv->v_type = VAR_STRING; - rettv->vval.v_string = (pat == NULL || *pat == NUL) + rettv->vval.v_string = (pat == NULL) ? NULL : file_pat_to_reg_pat(pat, NULL, NULL, false); } diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 3256004153..899e338b48 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -7119,6 +7119,10 @@ char_u * file_pat_to_reg_pat( if (pat_end == NULL) pat_end = pat + STRLEN(pat); + if (pat_end == pat) { + return (char_u *)xstrdup("^$"); + } + size_t size = 2; // '^' at start, '$' at end. for (p = pat; p < pat_end; p++) { -- cgit