Utilised json.Unmarshal instead of json.NewDecoder

client.go

@@ -8,10 +8,10 @@ import (
 	"context"
 	"crypto/tls"
 	"encoding/json"
-	"io"
 	"net"
 	"net/http"
 	"strconv"
+	"sync"
 	"time"
 
 	"github.com/sideshow/apns2/token"
@@ -183,13 +183,28 @@ func (c *Client) PushWithContext(ctx Context, n *Notification) (*Response, error
 	r.StatusCode = response.StatusCode
 	r.ApnsID = response.Header.Get("apns-id")
 
-	decoder := json.NewDecoder(response.Body)
-	if err := decoder.Decode(r); err != nil && err != io.EOF {
+	buffer := buffers.Get().(*bytes.Buffer)
+	buffer.Reset()
+	defer buffers.Put(buffer)
+
+	if _, err := buffer.ReadFrom(response.Body); err != nil {
+		return nil, err
+	}
+	if buffer.Len() == 0 {
+		return r, nil
+	}
+	if err := json.Unmarshal(buffer.Bytes(), r); err != nil {
 		return &Response{}, err
 	}
 	return r, nil
 }
 
+var buffers = sync.Pool{
+	New: func() interface{} {
+		return new(bytes.Buffer)
+	},
+}
+
 // CloseIdleConnections closes any underlying connections which were previously
 // connected from previous requests but are now sitting idle. It will not
 // interrupt any connections currently in use.

client_test.go

@@ -421,6 +421,17 @@ func TestMalformedJSONResponse(t *testing.T) {
 	assert.Equal(t, false, res.Sent())
 }
 
+func TestUnexpectedEOF(t *testing.T) {
+	n := mockNotification()
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Length", "1")
+	}))
+	defer server.Close()
+	res, err := mockClient(server.URL).Push(n)
+	assert.Error(t, err)
+	assert.Nil(t, res)
+}
+
 func TestCloseIdleConnections(t *testing.T) {
 	transport := &mockTransport{}