diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-11-06 20:23:35 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-11-06 20:23:35 +0300 |
| commit | 24a353364d6d186d528009fd0bb603d87183cf35 (patch) | |
| tree | a4070dc00731475d6bbdd3c84e61806b33802f7a /src/nvim/eval/decode.c | |
| parent | f2660bee6aca35be3d0ddb1d225784476c13cd27 (diff) | |
| parent | 946c2a8ee85830c543e389724575ae531e89b170 (diff) | |
| download | rneovim-24a353364d6d186d528009fd0bb603d87183cf35.tar.gz rneovim-24a353364d6d186d528009fd0bb603d87183cf35.tar.bz2 rneovim-24a353364d6d186d528009fd0bb603d87183cf35.zip | |
Merge branch 'master' into expression-parser
Diffstat (limited to 'src/nvim/eval/decode.c')
| -rw-r--r-- | src/nvim/eval/decode.c | 2 |
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(); |