diff options
| author | lonerover <pathfinder1644@yahoo.com> | 2017-03-17 23:09:15 +0800 |
|---|---|---|
| committer | lonerover <pathfinder1644@yahoo.com> | 2017-03-21 21:16:11 +0800 |
| commit | 26d7757ccbc57125a3dfe3b2cad0f07a2e567df1 (patch) | |
| tree | de5bc8c150d7a730426729fddf8c1dd01b36b6d2 /src | |
| parent | a5481957c65985fc1f885464ae9b43f92d0dc519 (diff) | |
| download | rneovim-26d7757ccbc57125a3dfe3b2cad0f07a2e567df1.tar.gz rneovim-26d7757ccbc57125a3dfe3b2cad0f07a2e567df1.tar.bz2 rneovim-26d7757ccbc57125a3dfe3b2cad0f07a2e567df1.zip | |
vim-patch:7.4.2256
Problem: Coverity complains about null pointer check.
Solution: Remove wrong and superfluous error check.
https://github.com/vim/vim/commit/db249f26edf7a5f88d1f4468d08ec5b84f5ab7ad
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 5 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index d4daffb469..5de999f175 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -4860,7 +4860,10 @@ static int get_string_tv(char_u **arg, typval_T *rettv, int evaluate) } *name = NUL; - *arg = p + 1; + if (*p != NUL) { // just in case + p++; + } + *arg = p; return OK; } diff --git a/src/nvim/version.c b/src/nvim/version.c index b9286c2a4e..5cdd0d96fe 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -185,7 +185,7 @@ static int included_patches[] = { // 2259, // 2258 NA // 2257 NA - // 2256, + 2256, 2255, // 2254 NA // 2253 NA |