From 0262f00bfbe01155a8b2997ce3ac0f956108d92e Mon Sep 17 00:00:00 2001 From: Denis Isaev Date: Wed, 8 Aug 2018 23:54:46 +0300 Subject: [PATCH] Fix #130: update ineffassign: fix crash on break/continue outside of loop --- Gopkg.lock | 4 ++-- vendor/github.com/golangci/ineffassign/ineffassign.go | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index c70303c3..5060d0f4 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -157,11 +157,11 @@ [[projects]] branch = "master" - digest = "1:55b1295e893690bce0d5952101bf21b3ce28a32bd3625007104068b76646e842" + digest = "1:3a5ea92f78579dfd319260ce995575c07890c8aff429035637287a00da664647" name = "github.com/golangci/ineffassign" packages = ["."] pruneopts = "UT" - revision = "7b41b0f84881918dab3c16c5e5148d8aa55d27b4" + revision = "2ee8f2867dde308c46d401d6d30f6c644094b167" [[projects]] branch = "master" diff --git a/vendor/github.com/golangci/ineffassign/ineffassign.go b/vendor/github.com/golangci/ineffassign/ineffassign.go index f2fcb5c5..3b61b36f 100644 --- a/vendor/github.com/golangci/ineffassign/ineffassign.go +++ b/vendor/github.com/golangci/ineffassign/ineffassign.go @@ -505,6 +505,12 @@ func (s *branchStack) get(lbl *ast.Ident) *branch { return br } } + + // Guard against invalid code (break/continue outside of loop). + if lbl == nil { + return &branch{} + } + return s.push(lbl.Obj) }