Mercurial > vim
changeset 10666:ed6f03535745 v8.0.0223
patch 8.0.0223: Coverity warns for an uninitialized variable
commit https://github.com/vim/vim/commit/fffbf308dd98d1129ba4914d921ab47dc6a6c9b1
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jan 23 20:47:12 2017 +0100
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.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 23 Jan 2017 21:00:04 +0100 |
| parents | ec5868458234 |
| children | f458238fe289 |
| files | src/tag.c src/version.c |
| diffstat | 2 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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;