Merge pull request #3025 from lifenjoiner/RespBody

jedisct1 · web-flow · commit 84ee7b3366f7 · 2025-11-10T11:57:27.000+01:00
Ensure xTransport Response.Body is closed
diff --git a/dnscrypt-proxy/xtransport.go b/dnscrypt-proxy/xtransport.go
@@ -751,6 +751,7 @@ func (xTransport *XTransport) Fetch(
 	}
 	statusCode := 503
 	if resp != nil {
+		defer resp.Body.Close()
 		statusCode = resp.StatusCode
 	}
 	if err != nil {
@@ -821,7 +822,6 @@ func (xTransport *XTransport) Fetch(
 	if err != nil {
 		return nil, statusCode, tls, rtt, err
 	}
-	resp.Body.Close()
 	return bin, statusCode, tls, rtt, err
 }
 

Original file line number	Diff line number	Diff line change
`@@ -751,6 +751,7 @@ func (xTransport *XTransport) Fetch(`
`751`	`751`	`}`
`752`	`752`	`statusCode := 503`
`753`	`753`	`if resp != nil {`
	`754`	`+ defer resp.Body.Close()`
`754`	`755`	`statusCode = resp.StatusCode`
`755`	`756`	`}`
`756`	`757`	`if err != nil {`
`@@ -821,7 +822,6 @@ func (xTransport *XTransport) Fetch(`
`821`	`822`	`if err != nil {`
`822`	`823`	`return nil, statusCode, tls, rtt, err`
`823`	`824`	`}`
`824`		`- resp.Body.Close()`
`825`	`825`	`return bin, statusCode, tls, rtt, err`
`826`	`826`	`}`
`827`	`827`