diff options
author | Dmitriy Vyukov <dvyukov@google.com> | 2012-03-08 08:53:08 +1100 |
---|---|---|
committer | Dmitriy Vyukov <dvyukov@google.com> | 2012-03-08 08:53:08 +1100 |
commit | 058a9629b909dac06be6f0b4e9cf729bce43a438 (patch) | |
tree | ac6b8e7d5c6cbd141f9dc037260ab98516f133bc | |
parent | 64bf9109857361e7158fd74c6ee3989528441392 (diff) | |
download | go-058a9629b909dac06be6f0b4e9cf729bce43a438.tar.gz |
encoding/gob: fix memory corruption
Fixes issue 3175.
R=golang-dev, iant, rsc, r
CC=golang-dev
http://codereview.appspot.com/5758069
Committer: Rob Pike <r@golang.org>
-rw-r--r-- | src/pkg/encoding/gob/decode.go | 3 | ||||
-rw-r--r-- | src/pkg/encoding/gob/gobencdec_test.go | 19 |
2 files changed, 22 insertions, 0 deletions
diff --git a/src/pkg/encoding/gob/decode.go b/src/pkg/encoding/gob/decode.go index 0708a83c9..e32a178ab 100644 --- a/src/pkg/encoding/gob/decode.go +++ b/src/pkg/encoding/gob/decode.go @@ -707,6 +707,9 @@ func (dec *Decoder) decodeInterface(ityp reflect.Type, state *decoderState, p ui if name == "" { // Copy the representation of the nil interface value to the target. // This is horribly unsafe and special. + if indir > 0 { + p = allocate(ityp, p, 1) // All but the last level has been allocated by dec.Indirect + } *(*[2]uintptr)(unsafe.Pointer(p)) = ivalue.InterfaceData() return } diff --git a/src/pkg/encoding/gob/gobencdec_test.go b/src/pkg/encoding/gob/gobencdec_test.go index 83644c033..45240d764 100644 --- a/src/pkg/encoding/gob/gobencdec_test.go +++ b/src/pkg/encoding/gob/gobencdec_test.go @@ -573,3 +573,22 @@ func TestGobEncodeIsZero(t *testing.T) { t.Fatalf("%v != %v", x, y) } } + +func TestGobEncodePtrError(t *testing.T) { + var err error + b := new(bytes.Buffer) + enc := NewEncoder(b) + err = enc.Encode(&err) + if err != nil { + t.Fatal("encode:", err) + } + dec := NewDecoder(b) + err2 := fmt.Errorf("foo") + err = dec.Decode(&err2) + if err != nil { + t.Fatal("decode:", err) + } + if err2 != nil { + t.Fatalf("expected nil, got %v", err2) + } +} |