From 4d8b88ef34380f562f0a39441ea191b09e95dd57 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Fri, 10 Jul 2015 14:22:33 -0400 Subject: [PATCH] Fix nil dereference reading policies with a failing connection (for instance, bad cert) --- api/sys_policy.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/sys_policy.go b/api/sys_policy.go index ea57a69ad8..ec47eaaf87 100644 --- a/api/sys_policy.go +++ b/api/sys_policy.go @@ -20,13 +20,13 @@ func (c *Sys) ListPolicies() ([]string, error) { func (c *Sys) GetPolicy(name string) (string, error) { r := c.c.NewRequest("GET", fmt.Sprintf("/v1/sys/policy/%s", name)) resp, err := c.c.RawRequest(r) - if resp.StatusCode == 404 { - return "", nil - } if err != nil { return "", err } defer resp.Body.Close() + if resp.StatusCode == 404 { + return "", nil + } var result getPoliciesResp err = resp.DecodeJSON(&result)