From e2e81c8c1d965d0e1274dcac71740dcc6d75dfcf Mon Sep 17 00:00:00 2001 From: Stanislav Osipov <57736012+stasos24@users.noreply.github.com> Date: Wed, 29 Nov 2023 05:33:31 +0300 Subject: [PATCH] Fix file handler leak (#1309) Co-authored-by: sosipov --- reporters/json_report.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/reporters/json_report.go b/reporters/json_report.go index be506f9b4..5d3e8db99 100644 --- a/reporters/json_report.go +++ b/reporters/json_report.go @@ -18,6 +18,7 @@ func GenerateJSONReport(report types.Report, destination string) error { if err != nil { return err } + defer f.Close() enc := json.NewEncoder(f) enc.SetIndent("", " ") err = enc.Encode([]types.Report{ @@ -26,7 +27,7 @@ func GenerateJSONReport(report types.Report, destination string) error { if err != nil { return err } - return f.Close() + return nil } // MergeJSONReports produces a single JSON-formatted report at the passed in destination by merging the JSON-formatted reports provided in sources @@ -57,11 +58,12 @@ func MergeAndCleanupJSONReports(sources []string, destination string) ([]string, if err != nil { return messages, err } + defer f.Close() enc := json.NewEncoder(f) enc.SetIndent("", " ") err = enc.Encode(allReports) if err != nil { return messages, err } - return messages, f.Close() + return messages, nil }