From 32b327f701f579d595b5b94cb7ca08813e366101 Mon Sep 17 00:00:00 2001 From: Hank Donnay Date: Wed, 23 Sep 2020 09:57:20 -0500 Subject: [PATCH] client: fix nil check These nil checks were checking an http.Response's Body member instead of the Response pointer, causing panics whenever the Response pointer was nil. Signed-off-by: Hank Donnay --- httptransport/client/indexer.go | 8 ++++---- httptransport/client/matcher.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/httptransport/client/indexer.go b/httptransport/client/indexer.go index 59c01cdd09..707bae00d5 100644 --- a/httptransport/client/indexer.go +++ b/httptransport/client/indexer.go @@ -38,7 +38,7 @@ func (s *HTTP) AffectedManifests(ctx context.Context, v []claircore.Vulnerabilit return affected, fmt.Errorf("failed to create request: %v", err) } resp, err := s.c.Do(req) - if resp.Body != nil { + if resp != nil { defer resp.Body.Close() } if err != nil { @@ -73,7 +73,7 @@ func (s *HTTP) Index(ctx context.Context, manifest *claircore.Manifest) (*clairc return nil, fmt.Errorf("failed to create request: %v", err) } resp, err := s.c.Do(req) - if resp.Body != nil { + if resp != nil { defer resp.Body.Close() } if err != nil { @@ -103,7 +103,7 @@ func (s *HTTP) IndexReport(ctx context.Context, manifest claircore.Digest) (*cla return nil, false, fmt.Errorf("failed to create request: %v", err) } resp, err := s.c.Do(req) - if resp.Body != nil { + if resp != nil { defer resp.Body.Close() } if err != nil { @@ -135,7 +135,7 @@ func (s *HTTP) State(ctx context.Context) (string, error) { return "", fmt.Errorf("failed to create request: %v", err) } resp, err := s.c.Do(req) - if resp.Body != nil { + if resp != nil { defer resp.Body.Close() } diff --git a/httptransport/client/matcher.go b/httptransport/client/matcher.go index 1c97b58c7d..170070d8ab 100644 --- a/httptransport/client/matcher.go +++ b/httptransport/client/matcher.go @@ -38,7 +38,7 @@ func (c *HTTP) Scan(ctx context.Context, ir *claircore.IndexReport) (*claircore. } resp, err := c.c.Do(req) - if resp.Body != nil { + if resp != nil { defer resp.Body.Close() } if err != nil {