From: andig <cpuidle@gmx.de>
Date: Mon, 9 Sep 2019 18:47:43 +0000 (+0000)
Subject: encoding/json: don't reset before returning buffer to pool
X-Git-Tag: go1.14beta1~1151
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=cf630586ca;p=gostls13.git

encoding/json: don't reset before returning buffer to pool

Reset is already performed when retrieving from pool

Change-Id: Ia810dd18d3e55a1565a5ad435a00d1e46724576c
GitHub-Last-Rev: d9df74a4aeb86e5d292c9fc33568a3c9a64a967d
GitHub-Pull-Request: golang/go#34195
Reviewed-on: https://go-review.googlesource.com/c/go/+/194338
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
---

diff --git a/src/encoding/json/encode.go b/src/encoding/json/encode.go
index f085b5a08d..2e1f56f882 100644
--- a/src/encoding/json/encode.go
+++ b/src/encoding/json/encode.go
@@ -164,7 +164,6 @@ func Marshal(v interface{}) ([]byte, error) {
 	}
 	buf := append([]byte(nil), e.Bytes()...)
 
-	e.Reset()
 	encodeStatePool.Put(e)
 
 	return buf, nil