From a2b2c7a7afdb9a164afc5805d5ee6a472efc2eb4 Mon Sep 17 00:00:00 2001 From: Denis Isaev Date: Tue, 24 Sep 2019 12:15:43 +0300 Subject: [PATCH] Fix #733: update forked bodyclose --- go.mod | 2 +- go.sum | 4 ++-- .../timakin/bodyclose/passes/bodyclose/bodyclose.go | 2 +- vendor/modules.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index e4df438b..05909276 100644 --- a/go.mod +++ b/go.mod @@ -58,7 +58,7 @@ replace ( github.com/go-macaron/cors => github.com/go-macaron/cors v0.0.0-20190418220122-6fd6a9bfe14e // https://github.com/timakin/bodyclose/pull/20 - github.com/timakin/bodyclose => github.com/golangci/bodyclose v0.0.0-20190910154619-42cacc375707 + github.com/timakin/bodyclose => github.com/golangci/bodyclose v0.0.0-20190924091105-43b3ff1b0de0 // https://github.com/golang/tools/pull/156 // https://github.com/golang/tools/pull/160 diff --git a/go.sum b/go.sum index 27833605..86a3a712 100644 --- a/go.sum +++ b/go.sum @@ -348,8 +348,8 @@ github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golangci/bodyclose v0.0.0-20190910154619-42cacc375707 h1:2TxNj7QxyKgq8R/YNibrlvwRY+YBIWfKtvZ9YGxxaKg= -github.com/golangci/bodyclose v0.0.0-20190910154619-42cacc375707/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= +github.com/golangci/bodyclose v0.0.0-20190924091105-43b3ff1b0de0 h1:SOIRs5twdFsHlEhPmysNtHiveNIMdXcwUZgvN+tKFWc= +github.com/golangci/bodyclose v0.0.0-20190924091105-43b3ff1b0de0/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0= github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9uMCefW1WDie15eSP/4MssdenaM= diff --git a/vendor/github.com/timakin/bodyclose/passes/bodyclose/bodyclose.go b/vendor/github.com/timakin/bodyclose/passes/bodyclose/bodyclose.go index 241db0f0..4cf577fb 100644 --- a/vendor/github.com/timakin/bodyclose/passes/bodyclose/bodyclose.go +++ b/vendor/github.com/timakin/bodyclose/passes/bodyclose/bodyclose.go @@ -325,7 +325,7 @@ func (r *runner) calledInFunc(f *ssa.Function, called bool) bool { } for _, vref := range vrefs { if c, ok := vref.(*ssa.Call); ok { - if c.Call.Method.Name() == closeMethod { + if c.Call.Method != nil && c.Call.Method.Name() == closeMethod { return !called } } diff --git a/vendor/modules.txt b/vendor/modules.txt index 8b63193b..be7a34f4 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -359,7 +359,7 @@ github.com/spf13/viper # github.com/stretchr/testify v1.4.0 github.com/stretchr/testify/assert github.com/stretchr/testify/require -# github.com/timakin/bodyclose v0.0.0-20190721030226-87058b9bfcec => github.com/golangci/bodyclose v0.0.0-20190910154619-42cacc375707 +# github.com/timakin/bodyclose v0.0.0-20190721030226-87058b9bfcec => github.com/golangci/bodyclose v0.0.0-20190924091105-43b3ff1b0de0 github.com/timakin/bodyclose/passes/bodyclose # github.com/ultraware/funlen v0.0.2 github.com/ultraware/funlen