Defer closing body before checking HTTP status code (#2870)

nikpivkin · web-flow · commit bb00f570d301 · 2023-08-15T09:42:05.000-04:00
diff --git a/scrape/scrape.go b/scrape/scrape.go
@@ -97,15 +97,17 @@ func (c *Client) get(urlStr string, a ...interface{}) (*goquery.Document, error)
 	if err != nil {
 		return nil, fmt.Errorf("error parsing URL: %q: %v", urlStr, err)
 	}
+
 	resp, err := c.Client.Get(u.String())
 	if err != nil {
 		return nil, fmt.Errorf("error fetching url %q: %v", u, err)
 	}
+	defer resp.Body.Close()
+
 	if resp.StatusCode == http.StatusNotFound {
 		return nil, fmt.Errorf("received %v response fetching URL %q", resp.StatusCode, u)
 	}
 
-	defer resp.Body.Close()
 	doc, err := goquery.NewDocumentFromReader(resp.Body)
 	if err != nil {
 		return nil, fmt.Errorf("error parsing response: %v", err)

Original file line number	Diff line number	Diff line change
`@@ -97,15 +97,17 @@ func (c Client) get(urlStr string, a ...interface{}) (goquery.Document, error)`
`97`	`97`	`if err != nil {`
`98`	`98`	`return nil, fmt.Errorf("error parsing URL: %q: %v", urlStr, err)`
`99`	`99`	`}`
	`100`	`+`
`100`	`101`	`resp, err := c.Client.Get(u.String())`
`101`	`102`	`if err != nil {`
`102`	`103`	`return nil, fmt.Errorf("error fetching url %q: %v", u, err)`
`103`	`104`	`}`
	`105`	`+ defer resp.Body.Close()`
	`106`	`+`
`104`	`107`	`if resp.StatusCode == http.StatusNotFound {`
`105`	`108`	`return nil, fmt.Errorf("received %v response fetching URL %q", resp.StatusCode, u)`
`106`	`109`	`}`
`107`	`110`
`108`		`- defer resp.Body.Close()`
`109`	`111`	`doc, err := goquery.NewDocumentFromReader(resp.Body)`
`110`	`112`	`if err != nil {`
`111`	`113`	`return nil, fmt.Errorf("error parsing response: %v", err)`