diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-01-28 17:00:49 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-01-28 17:00:49 -0500 |
| commit | 73e83e85662e201f84786134573070135cec05ed (patch) | |
| tree | 90eeb56d7a65616f45190a34fa80bad4d7649ce8 /src/nvim/eval.c | |
| parent | 1574c4a115ab0d554131c5bfae38fbdad765a0d0 (diff) | |
| parent | db77b7bc9e510f790064333473abde98e0284af1 (diff) | |
| download | rneovim-73e83e85662e201f84786134573070135cec05ed.tar.gz rneovim-73e83e85662e201f84786134573070135cec05ed.tar.bz2 rneovim-73e83e85662e201f84786134573070135cec05ed.zip | |
Merge pull request #4096 from justinmk/coverity125476
coverity/125476: RI: Null pointer dereference
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 22ff7988f3..a1c5f958d1 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -10822,15 +10822,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); } /* |