diff options
author | Aman Karmani <aman@tmm1.net> | 2021-03-02 11:52:34 -0800 |
---|---|---|
committer | Emmanuel Odeke <emmanuel@orijtech.com> | 2021-03-13 11:52:17 +0000 |
commit | b3235b75d109f06eec0d3603c606b2d8373b9d4c (patch) | |
tree | 09e8a7e9b3428b816afa40c61b06494633a687d6 | |
parent | 83e79c7b1474bfd7398cc69207587547885fa96e (diff) | |
download | go-b3235b75d109f06eec0d3603c606b2d8373b9d4c.tar.gz go-b3235b75d109f06eec0d3603c606b2d8373b9d4c.zip |
encoding/gob: ensure "duplicate type received" decoder errors surface up
Previously re-using a decoder with a new stream resulted in a confusing
"extra data in buffer" error message.
Change-Id: Ia4c4c3a2d4b63c59e37e53faa61a500d5ff6e5f1
Reviewed-on: https://go-review.googlesource.com/c/go/+/297949
Reviewed-by: Rob Pike <r@golang.org>
Run-TryBot: Rob Pike <r@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Trust: Emmanuel Odeke <emmanuel@orijtech.com>
-rw-r--r-- | src/encoding/gob/decoder.go | 3 | ||||
-rw-r--r-- | src/encoding/gob/encoder_test.go | 25 |
2 files changed, 28 insertions, 0 deletions
diff --git a/src/encoding/gob/decoder.go b/src/encoding/gob/decoder.go index b52aabe54b..7eb3093391 100644 --- a/src/encoding/gob/decoder.go +++ b/src/encoding/gob/decoder.go @@ -152,6 +152,9 @@ func (dec *Decoder) decodeTypeSequence(isInterface bool) typeId { } // Type definition for (-id) follows. dec.recvType(-id) + if dec.err != nil { + break + } // When decoding an interface, after a type there may be a // DelimitedValue still in the buffer. Skip its count. // (Alternatively, the buffer is empty and the byte count diff --git a/src/encoding/gob/encoder_test.go b/src/encoding/gob/encoder_test.go index fe2774948a..6183646f60 100644 --- a/src/encoding/gob/encoder_test.go +++ b/src/encoding/gob/encoder_test.go @@ -1127,3 +1127,28 @@ func TestBadData(t *testing.T) { } } } + +func TestDecodeErrorMultipleTypes(t *testing.T) { + type Test struct { + A string + B int + } + var b bytes.Buffer + NewEncoder(&b).Encode(Test{"one", 1}) + + var result, result2 Test + dec := NewDecoder(&b) + err := dec.Decode(&result) + if err != nil { + t.Errorf("decode: unexpected error %v", err) + } + + b.Reset() + NewEncoder(&b).Encode(Test{"two", 2}) + err = dec.Decode(&result2) + if err == nil { + t.Errorf("decode: expected duplicate type error, got nil") + } else if !strings.Contains(err.Error(), "duplicate type") { + t.Errorf("decode: expected duplicate type error, got %s", err.Error()) + } +} |