From fffbf308dd98d1129ba4914d921ab47dc6a6c9b1 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 23 Jan 2017 20:47:12 +0100 Subject: [PATCH] patch 8.0.0223: Coverity warns for an uninitialized variable Problem: Coverity gets confused by the flags passed to find_tags() and warnts for an uninitialized variable. Solution: Disallow using cscope and help tags at the same time. --- src/tag.c | 12 +++++++++++- src/version.c | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/tag.c b/src/tag.c index bd0dd740c..83890698f 100644 --- a/src/tag.c +++ b/src/tag.c @@ -1256,6 +1256,7 @@ prepare_pats(pat_T *pats, int has_re) * TAG_REGEXP use "pat" as a regexp * TAG_NOIC don't always ignore case * TAG_KEEP_LANG keep language + * TAG_CSCOPE use cscope results for tags */ int find_tags( @@ -1423,6 +1424,14 @@ find_tags( */ if (help_only) /* want tags from help file */ curbuf->b_help = TRUE; /* will be restored later */ +#ifdef FEAT_CSCOPE + else if (use_cscope) + { + /* Make sure we don't mix help and cscope, confuses Coverity. */ + help_only = FALSE; + curbuf->b_help = FALSE; + } +#endif orgpat.len = (int)STRLEN(pat); #ifdef FEAT_MULTI_LANG @@ -2281,7 +2290,8 @@ parse_line: */ *tagp.tagname_end = NUL; len = (int)(tagp.tagname_end - tagp.tagname); - mfp = (char_u *)alloc((int)sizeof(char_u) + len + 10 + ML_EXTRA + 1); + mfp = (char_u *)alloc((int)sizeof(char_u) + + len + 10 + ML_EXTRA + 1); if (mfp != NULL) { int heuristic; diff --git a/src/version.c b/src/version.c index cae4e7dd4..d92b6ed26 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 223, /**/ 222, /**/ -- 2.40.0