Skip to content

Commit 54eaf8d

Browse files
author
miktwon
committed
fix nil pointer dereference in status.GetStats
1 parent e842d2b commit 54eaf8d

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

pkg/phpfpm/status.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func GetStats(listen, statusPath string) (*Status, error) {
4747
if err != nil && err != io.EOF {
4848
return nil, err
4949
}
50-
defer resp.Body.Close()
50+
defer tryClose(resp.Body)
5151

5252
content, err := ioutil.ReadAll(resp.Body)
5353
if err != nil && err != io.EOF {
@@ -61,3 +61,10 @@ func GetStats(listen, statusPath string) (*Status, error) {
6161

6262
return &s, nil
6363
}
64+
65+
func tryClose(closer io.ReadCloser) {
66+
if closer == nil {
67+
return
68+
}
69+
closer.Close()
70+
}

0 commit comments

Comments
 (0)