mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-11 13:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3502 from ZyX-I/fix-xdg

Browse Source 
option: Fix typos that may lead to SEGV in some cases
This commit is contained in:
Justin M. Keyes
2015-10-26 12:48:42 -04:00
parent 29d64a901d be6b784766
commit 77e93a65fe
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/option.c
View File

@@ -333,7 +333,7 @@ static inline size_t compute_double_colon_len(const char *const val,
const size_t single_suf_len) const size_t single_suf_len)
FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_PURE
{ {
if (val == NULL && *val) { if (val == NULL || *val == NUL) {
return 0; return 0;
} }
size_t ret = 0; size_t ret = 0;
@@ -378,7 +378,7 @@ static inline char *add_colon_dirs(char *dest, const char *const val,
const bool forward) const bool forward)
FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_RET FUNC_ATTR_NONNULL_ARG(1) FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_RET FUNC_ATTR_NONNULL_ARG(1)
{ {
if (val == NULL && *val) { if (val == NULL || *val == NUL) {
return dest; return dest;
} }
const void *iter = NULL; const void *iter = NULL;
@@ -435,7 +435,7 @@ static inline char *add_dir(char *dest, const char *const dir,
const char *const suf2, const size_t len2) const char *const suf2, const size_t len2)
FUNC_ATTR_NONNULL_RET FUNC_ATTR_NONNULL_ARG(1) FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_RET FUNC_ATTR_NONNULL_ARG(1) FUNC_ATTR_WARN_UNUSED_RESULT
{ {
if (dir == NULL && dir_len != 0) { if (dir == NULL || dir_len == 0) {
return dest; return dest;
} }
dest = strcpy_comma_escaped(dest, dir, dir_len); dest = strcpy_comma_escaped(dest, dir, dir_len);