Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-11-09 05:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

gobs: fix bug in singleton arrays

Browse source 
Fixes #934.

R=rsc
CC=golang-dev
https://golang.org/cl/1869043
This commit is contained in:
Rob Pike 2010-07-20 19:53:28 -07:00
parent 8f9aeb5a66
commit a0d1c9263e
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/pkg/gob/encode.go
View file

@ -722,10 +722,6 @@ func encOpFor(rt reflect.Type) (encOp, int, os.Error) {
return nil, 0, err return nil, 0, err
} }
op = func(i *encInstr, state *encoderState, p unsafe.Pointer) { op = func(i *encInstr, state *encoderState, p unsafe.Pointer) {
slice := (*reflect.SliceHeader)(p)
if slice.Len == 0 {
return
}
state.update(i) state.update(i)
state.err = encodeArray(state.b, uintptr(p), elemOp, t.Elem().Size(), indir, t.Len()) state.err = encodeArray(state.b, uintptr(p), elemOp, t.Elem().Size(), indir, t.Len())
} }

5
src/pkg/gob/encoder_test.go
View file

@ -274,6 +274,7 @@ var testFloat32 float32
var testString string var testString string
var testSlice []string var testSlice []string
var testMap map[string]int var testMap map[string]int
var testArray [7]int
type SingleTest struct { type SingleTest struct {
in interface{} in interface{}
@ -287,6 +288,8 @@ var singleTests = []SingleTest{
SingleTest{"bike shed", &testString, ""}, SingleTest{"bike shed", &testString, ""},
SingleTest{[]string{"bike", "shed", "paint", "color"}, &testSlice, ""}, SingleTest{[]string{"bike", "shed", "paint", "color"}, &testSlice, ""},
SingleTest{map[string]int{"seven": 7, "twelve": 12}, &testMap, ""}, SingleTest{map[string]int{"seven": 7, "twelve": 12}, &testMap, ""},
SingleTest{[7]int{4, 55, 0, 0, 0, 0, 0}, &testArray, ""}, // case that once triggered a bug
SingleTest{[7]int{4, 55, 1, 44, 22, 66, 1234}, &testArray, ""},
// Decode errors // Decode errors
SingleTest{172, &testFloat32, "wrong type"}, SingleTest{172, &testFloat32, "wrong type"},
@ -320,7 +323,7 @@ func TestSingletons(t *testing.T) {
// Get rid of the pointer in the rhs // Get rid of the pointer in the rhs
val := reflect.NewValue(test.out).(*reflect.PtrValue).Elem().Interface() val := reflect.NewValue(test.out).(*reflect.PtrValue).Elem().Interface()
if !reflect.DeepEqual(test.in, val) { if !reflect.DeepEqual(test.in, val) {
t.Errorf("decoding int: expected %v got %v", test.in, val) t.Errorf("decoding singleton: expected %v got %v", test.in, val)
} }
} }
} }