From 903958d2f506decf92a1bfd63dfbecadf8375735 Mon Sep 17 00:00:00 2001 From: korzhao Date: Wed, 4 Aug 2021 02:47:57 +0000 Subject: encoding/gob: marshal maps using reflect.Value.MapRange 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: 5c01e117f4451dbaec657d02d006905df1d0055d GitHub-Pull-Request: golang/go#47476 Reviewed-on: https://go-review.googlesource.com/c/go/+/338609 Trust: Bryan C. Mills Run-TryBot: Bryan C. Mills TryBot-Result: Go Bot Reviewed-by: Rob Pike --- src/encoding/gob/encode.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/encoding/gob/encode.go') diff --git a/src/encoding/gob/encode.go b/src/encoding/gob/encode.go index 8f8f170c16..f1f5f3862d 100644 --- a/src/encoding/gob/encode.go +++ b/src/encoding/gob/encode.go @@ -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) } -- cgit v1.3