aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/ex_getln.c
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-04-02 09:21:25 -0400
committerGitHub <noreply@github.com>2021-04-02 09:21:25 -0400
commitcf6c23fb0f1e67484103da9fc583abfbc6e6db91 (patch)
tree69802c718938fb1d58560fc39f26784181b434b9 /src/nvim/ex_getln.c
parent3f7cd18c4a416ea8805ffee445ec90d703806c78 (diff)
parent4f3396e128b0a1820fbb7f8e138def0322571244 (diff)
downloadrneovim-cf6c23fb0f1e67484103da9fc583abfbc6e6db91.tar.gz
rneovim-cf6c23fb0f1e67484103da9fc583abfbc6e6db91.tar.bz2
rneovim-cf6c23fb0f1e67484103da9fc583abfbc6e6db91.zip
Merge pull request #14273 from janlazo/clang-warnings
clang: resolve logic error and dead store warnings
Diffstat (limited to 'src/nvim/ex_getln.c')
-rw-r--r--src/nvim/ex_getln.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 76df01c205..38385d19b2 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -4093,9 +4093,10 @@ ExpandOne (
}
if (mode == WILD_CANCEL) {
- ss = vim_strsave(orig_save);
+ ss = vim_strsave(orig_save ? orig_save : (char_u *)"");
} else if (mode == WILD_APPLY) {
- ss = vim_strsave(findex == -1 ? orig_save : xp->xp_files[findex]);
+ ss = vim_strsave(findex == -1 ? (orig_save ? orig_save : (char_u *)"") :
+ xp->xp_files[findex]);
}
/* free old names */