diff options
author | @42wim <wim@42.be> | 2016-07-04 12:58:21 +0200 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-07-04 06:58:21 -0400 |
commit | 24fe19965a616fd0c9a5e754a7dd83231be8bf83 (patch) | |
tree | 65f8bd34e27f402f66fa76d17639479f8bf721ff /model | |
parent | 8a069cac9ae67138c74abf6b292cbc48d2464636 (diff) | |
download | chat-24fe19965a616fd0c9a5e754a7dd83231be8bf83.tar.gz chat-24fe19965a616fd0c9a5e754a7dd83231be8bf83.tar.bz2 chat-24fe19965a616fd0c9a5e754a7dd83231be8bf83.zip |
Fix FD leak (#3464)
Diffstat (limited to 'model')
-rw-r--r-- | model/client.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/model/client.go b/model/client.go index 8ed221627..1882fd0ab 100644 --- a/model/client.go +++ b/model/client.go @@ -980,6 +980,7 @@ func (c *Client) JoinChannel(id string) (*Result, *AppError) { if r, err := c.DoApiPost(c.GetChannelRoute(id)+"/join", ""); err != nil { return nil, err } else { + defer closeBody(r) return &Result{r.Header.Get(HEADER_REQUEST_ID), r.Header.Get(HEADER_ETAG_SERVER), nil}, nil } @@ -989,6 +990,7 @@ func (c *Client) JoinChannelByName(name string) (*Result, *AppError) { if r, err := c.DoApiPost(c.GetChannelNameRoute(name)+"/join", ""); err != nil { return nil, err } else { + defer closeBody(r) return &Result{r.Header.Get(HEADER_REQUEST_ID), r.Header.Get(HEADER_ETAG_SERVER), nil}, nil } @@ -998,6 +1000,7 @@ func (c *Client) LeaveChannel(id string) (*Result, *AppError) { if r, err := c.DoApiPost(c.GetChannelRoute(id)+"/leave", ""); err != nil { return nil, err } else { + defer closeBody(r) return &Result{r.Header.Get(HEADER_REQUEST_ID), r.Header.Get(HEADER_ETAG_SERVER), nil}, nil } @@ -1007,6 +1010,7 @@ func (c *Client) DeleteChannel(id string) (*Result, *AppError) { if r, err := c.DoApiPost(c.GetChannelRoute(id)+"/delete", ""); err != nil { return nil, err } else { + defer closeBody(r) return &Result{r.Header.Get(HEADER_REQUEST_ID), r.Header.Get(HEADER_ETAG_SERVER), nil}, nil } @@ -1018,6 +1022,7 @@ func (c *Client) AddChannelMember(id, user_id string) (*Result, *AppError) { if r, err := c.DoApiPost(c.GetChannelRoute(id)+"/add", MapToJson(data)); err != nil { return nil, err } else { + defer closeBody(r) return &Result{r.Header.Get(HEADER_REQUEST_ID), r.Header.Get(HEADER_ETAG_SERVER), nil}, nil } @@ -1029,6 +1034,7 @@ func (c *Client) RemoveChannelMember(id, user_id string) (*Result, *AppError) { if r, err := c.DoApiPost(c.GetChannelRoute(id)+"/remove", MapToJson(data)); err != nil { return nil, err } else { + defer closeBody(r) return &Result{r.Header.Get(HEADER_REQUEST_ID), r.Header.Get(HEADER_ETAG_SERVER), nil}, nil } @@ -1038,6 +1044,7 @@ func (c *Client) UpdateLastViewedAt(channelId string) (*Result, *AppError) { if r, err := c.DoApiPost(c.GetChannelRoute(channelId)+"/update_last_viewed_at", ""); err != nil { return nil, err } else { + defer closeBody(r) return &Result{r.Header.Get(HEADER_REQUEST_ID), r.Header.Get(HEADER_ETAG_SERVER), nil}, nil } @@ -1407,6 +1414,7 @@ func (c *Client) PostToWebhook(id, payload string) (*Result, *AppError) { if r, err := c.DoPost("/hooks/"+id, payload, "application/x-www-form-urlencoded"); err != nil { return nil, err } else { + defer closeBody(r) return &Result{r.Header.Get(HEADER_REQUEST_ID), r.Header.Get(HEADER_ETAG_SERVER), nil}, nil } @@ -1448,6 +1456,7 @@ func (c *Client) SetPreferences(preferences *Preferences) (*Result, *AppError) { if r, err := c.DoApiPost("/preferences/save", preferences.ToJson()); err != nil { return nil, err } else { + defer closeBody(r) return &Result{r.Header.Get(HEADER_REQUEST_ID), r.Header.Get(HEADER_ETAG_SERVER), preferences}, nil } |