# HG changeset patch # User Christian Brabandt # Date 1467141306 -7200 # Node ID ce5b79b005ecb9f67fb1864d40756ae97be31c41 # Parent 94b6a7494bb1c893426c288192a6a44f330954e4 commit https://github.com/vim/vim/commit/bcf7772a23624edc0942120e564f6b4ac95604ad Author: Bram Moolenaar Date: Tue Jun 28 21:11:32 2016 +0200 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 --- 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 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1966, +/**/ 1965, /**/ 1964,