Skip to content

Commit d1643ab

Browse files
authored
Merge branch 'main' into main
2 parents 1be9849 + 2f4a7b5 commit d1643ab

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ adheres to the format set out by [Keep a Changelog](https://keepachangelog.com/e
55

66
# Unreleased
77

8+
- [`Fix`] Ensure proper cleanup of response body on read error to prevent potential memory leak.
9+
810
# v1.5.0 (2/10/2024)
911

1012
- [`Fix`] Make NodeClient match AptosRpcClient interface

nodeClient.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -1079,11 +1079,11 @@ func Get[T any](rc *NodeClient, getUrl string) (out T, err error) {
10791079
err = NewHttpError(response)
10801080
return out, err
10811081
}
1082+
defer response.Body.Close()
10821083
blob, err := io.ReadAll(response.Body)
10831084
if err != nil {
10841085
return out, fmt.Errorf("error getting response data, %w", err)
10851086
}
1086-
_ = response.Body.Close()
10871087
err = json.Unmarshal(blob, &out)
10881088
if err != nil {
10891089
return out, err
@@ -1114,12 +1114,12 @@ func (rc *NodeClient) GetBCS(getUrl string) (out []byte, err error) {
11141114
err = NewHttpError(response)
11151115
return
11161116
}
1117+
defer response.Body.Close()
11171118
blob, err := io.ReadAll(response.Body)
11181119
if err != nil {
11191120
err = fmt.Errorf("error getting response data, %w", err)
11201121
return
11211122
}
1122-
_ = response.Body.Close()
11231123
return blob, nil
11241124
}
11251125

@@ -1149,12 +1149,12 @@ func Post[T any](rc *NodeClient, postUrl string, contentType string, body io.Rea
11491149
err = NewHttpError(response)
11501150
return data, err
11511151
}
1152+
defer response.Body.Close()
11521153
blob, err := io.ReadAll(response.Body)
11531154
if err != nil {
11541155
err = fmt.Errorf("error getting response data, %w", err)
11551156
return data, err
11561157
}
1157-
_ = response.Body.Close()
11581158

11591159
err = json.Unmarshal(blob, &data)
11601160
return data, err

0 commit comments

Comments
 (0)