From c15e796211f04b16f58d06fe440f4009a69a1a01 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Mon, 25 Jan 2016 02:12:06 -0500 Subject: coverity/125476: RI: Null pointer dereference --- src/nvim/eval.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/nvim/eval.c') diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 219bd38d82..33c584eede 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -10786,15 +10786,15 @@ static void f_globpath(typval_T *argvars, typval_T *rettv) } } -/* - * "glob2regpat()" function - */ +// "glob2regpat()" function static void f_glob2regpat(typval_T *argvars, typval_T *rettv) { - char_u *pat = get_tv_string_chk(&argvars[0]); + char_u *pat = get_tv_string_chk(&argvars[0]); // NULL on type error - rettv->v_type = VAR_STRING; - rettv->vval.v_string = file_pat_to_reg_pat(pat, NULL, NULL, FALSE); + rettv->v_type = VAR_STRING; + rettv->vval.v_string = (pat == NULL) + ? NULL + : file_pat_to_reg_pat(pat, NULL, NULL, false); } /* -- cgit From 894fcb778e123a9986be480e94dc78b545e01ec4 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Wed, 27 Jan 2016 03:26:13 -0500 Subject: glob2regpat(): handle empty string. --- src/nvim/eval.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/eval.c') diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 33c584eede..25f3cbf180 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) + rettv->vval.v_string = (pat == NULL || *pat == NUL) ? NULL : file_pat_to_reg_pat(pat, NULL, NULL, false); } -- cgit 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/eval.c') 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); } -- cgit