aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2018-04-16 11:36:06 +0300
committerZyX <kp-pav@yandex.ru>2018-04-16 11:36:06 +0300
commitd0850586df3dbf738542dac55b6329d6de1ad73b (patch)
tree8dce552f65712bab8ed5ade63529c9037655c884
parent6a5b9de54648175386f5ac9edc2fa591bc3023ed (diff)
downloadrneovim-d0850586df3dbf738542dac55b6329d6de1ad73b.tar.gz
rneovim-d0850586df3dbf738542dac55b6329d6de1ad73b.tar.bz2
rneovim-d0850586df3dbf738542dac55b6329d6de1ad73b.zip
option: Fix PVS/V547: var is always NULL at that point
-rw-r--r--src/nvim/option.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 35830b9ca5..f50d735e50 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -6219,14 +6219,15 @@ void ExpandOldSetting(int *num_file, char_u ***file)
}
if (expand_option_idx >= 0) {
- /* put string of option value in NameBuff */
+ // Put string of option value in NameBuff.
option_value2string(&options[expand_option_idx], expand_option_flags);
var = NameBuff;
- } else if (var == NULL)
+ } else {
var = (char_u *)"";
+ }
- /* A backslash is required before some characters. This is the reverse of
- * what happens in do_set(). */
+ // A backslash is required before some characters. This is the reverse of
+ // what happens in do_set().
char_u *buf = vim_strsave_escaped(var, escape_chars);
#ifdef BACKSLASH_IN_FILENAME