From: Bram Moolenaar Date: Tue, 28 Jun 2016 19:11:32 +0000 (+0200) Subject: patch 7.4.1966 X-Git-Tag: v7.4.1966 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bcf7772a23624edc0942120e564f6b4ac95604ad;p=vim patch 7.4.1966 Problem: Coverity reports a resource leak. Solution: Close "fd" also when bailing out. --- diff --git a/src/quickfix.c b/src/quickfix.c index b791d6042..366e4bd92 100644 --- a/src/quickfix.c +++ b/src/quickfix.c @@ -1101,7 +1101,7 @@ restofline: } /* return number of matches */ retval = qi->qf_lists[qi->qf_curlist].qf_count; - goto qf_init_ok; + goto qf_init_end; } EMSG(_(e_readerrf)); error2: @@ -1109,13 +1109,12 @@ error2: qi->qf_listcount--; if (qi->qf_curlist > 0) --qi->qf_curlist; -qf_init_ok: +qf_init_end: if (fd != NULL) fclose(fd); free_efm_list(&fmt_first); qf_clean_dir_stack(&dir_stack); qf_clean_dir_stack(&file_stack); -qf_init_end: vim_free(namebuf); vim_free(errmsg); vim_free(pattern); diff --git a/src/version.c b/src/version.c index 85019976b..4d39ea374 100644 --- a/src/version.c +++ b/src/version.c @@ -753,6 +753,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1966, /**/ 1965, /**/