summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-07-01 13:15:24 +0200
committerBram Moolenaar <Bram@vim.org>2020-07-01 13:15:24 +0200
commit11b6600c88165c70d9ccbbdd4d9c96e8266e365f (patch)
treeb695de86eaeaf712ab874fa696213e1daf2b1fe2
parente707c882b23a53d2c1f0d1f7fc3a7be247aca614 (diff)
downloadvim-git-11b6600c88165c70d9ccbbdd4d9c96e8266e365f.tar.gz
patch 8.2.1104: Coverity warnts for possible NULL pointer usev8.2.1104
Problem: Coverity warnts for possible NULL pointer use. Solution: Check "pbyts" is not NULL.
-rw-r--r--src/spellsuggest.c3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/spellsuggest.c b/src/spellsuggest.c
index 6f9a75698..0821dc62c 100644
--- a/src/spellsuggest.c
+++ b/src/spellsuggest.c
@@ -1406,7 +1406,8 @@ suggest_trie_walk(
tword[sp->ts_twordlen] = NUL;
if (sp->ts_prefixdepth <= PFD_NOTSPECIAL
- && (sp->ts_flags & TSF_PREFIXOK) == 0)
+ && (sp->ts_flags & TSF_PREFIXOK) == 0
+ && pbyts != NULL)
{
// There was a prefix before the word. Check that the prefix
// can be used with this word.
diff --git a/src/version.c b/src/version.c
index 53bb772a9..4c3ab9639 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1104,
+/**/
1103,
/**/
1102,