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

encoding/gob: marshal maps using reflect.Value.MapRange

Browse source 
golang.org/cl/33572 added a map iterator.

use the reflect.Value.MapRange to fix map keys that contain a NaN

Fixes #24075

Change-Id: I0214d6f26c2041797703e48eac16404f189d6982
GitHub-Last-Rev: 5c01e117f4
GitHub-Pull-Request: golang/go#47476
Reviewed-on: https://go-review.googlesource.com/c/go/+/338609
Trust: Bryan C. Mills <bcmills@google.com>
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Rob Pike <r@golang.org>
This commit is contained in:
korzhao 2021-08-04 02:47:57 +00:00 • committed by Bryan C. Mills
parent 6640171914
commit 903958d2f5
2 changed files with 55 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/encoding/gob/encode.go
View file

@ -368,11 +368,11 @@ func (enc *Encoder) encodeMap(b *encBuffer, mv reflect.Value, keyOp, elemOp encO
state := enc.newEncoderState(b)
state.fieldnum = -1
state.sendZero = true
keys := mv.MapKeys()
state.encodeUint(uint64(len(keys)))
for _, key := range keys {
encodeReflectValue(state, key, keyOp, keyIndir)
encodeReflectValue(state, mv.MapIndex(key), elemOp, elemIndir)
state.encodeUint(uint64(mv.Len()))
mi := mv.MapRange()
for mi.Next() {
encodeReflectValue(state, mi.Key(), keyOp, keyIndir)
encodeReflectValue(state, mi.Value(), elemOp, elemIndir)
}
enc.freeEncoderState(state)
}