From: Rob Pike <r@golang.org>
Date: Fri, 7 May 2010 20:30:13 +0000 (-0700)
Subject: gob: bug fix: errors encoding the payload were not
X-Git-Tag: weekly.2010-05-27~101
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b541921b66a57b887efcf4a696835b4917de85d5;p=gostls13.git

gob: bug fix: errors encoding the payload were not
returned to caller.

R=rsc
CC=golang-dev
https://golang.org/cl/1164041
---

diff --git a/src/pkg/gob/encoder.go b/src/pkg/gob/encoder.go
index 308c58d303..3d217e2720 100644
--- a/src/pkg/gob/encoder.go
+++ b/src/pkg/gob/encoder.go
@@ -173,8 +173,12 @@ func (enc *Encoder) Encode(e interface{}) os.Error {
 	encodeInt(enc.state, int64(enc.sent[rt]))
 
 	// Encode the object.
-	encode(enc.state.b, e)
-	enc.send()
+	err := encode(enc.state.b, e)
+	if err != nil {
+		enc.setError(err)
+	} else {
+		enc.send()
+	}
 
 	return enc.state.err
 }