aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval/decode.c
diff options
context:
space:
mode:
authorAdrian Neumann <adrian_neumann@gmx.de>2017-09-28 10:19:57 +0200
committerJustin M. Keyes <justinkz@gmail.com>2017-11-06 05:00:58 +0100
commit8f03014e8861df7f49bf4e1dbdfcc20e1611ce35 (patch)
tree33bc5bc3af4e2ff6337f8c976f42de7fa48a0aed /src/nvim/eval/decode.c
parentd31b94ac209d2161f60084d5fa1e18f0cbaf0207 (diff)
downloadrneovim-8f03014e8861df7f49bf4e1dbdfcc20e1611ce35.tar.gz
rneovim-8f03014e8861df7f49bf4e1dbdfcc20e1611ce35.tar.bz2
rneovim-8f03014e8861df7f49bf4e1dbdfcc20e1611ce35.zip
eval/decode.c: Avoid NULL arg to memchr() #7332
Clang complains because memchr has undefined behavior if the ptr is NULL, even if len==0. Helped-by: Nikolai Aleksandrovich Pavlov <kp-pav@yandex.ru>
Diffstat (limited to 'src/nvim/eval/decode.c')
-rw-r--r--src/nvim/eval/decode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/eval/decode.c b/src/nvim/eval/decode.c
index 9c9c2c2dc8..0933b1bf9c 100644
--- a/src/nvim/eval/decode.c
+++ b/src/nvim/eval/decode.c
@@ -266,7 +266,7 @@ typval_T decode_string(const char *const s, const size_t len,
{
assert(s != NULL || len == 0);
const bool really_hasnul = (hasnul == kNone
- ? memchr(s, NUL, len) != NULL
+ ? ((s != NULL) && (memchr(s, NUL, len) != NULL))
: (bool)hasnul);
if (really_hasnul) {
list_T *const list = tv_list_alloc();