CopyToJSON: fix bitSize for floats

tinylib · Sep 17, 2020 · 87c1ec4 · 87c1ec4
1 parent e88e92c
commit 87c1ec4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/msgp/json.go b/msgp/json.go
@@ -206,7 +206,7 @@ func rwFloat32(dst jsWriter, src *Reader) (int, error) {
 	if err != nil {
 		return 0, err
 	}
-	src.scratch = strconv.AppendFloat(src.scratch[:0], float64(f), 'f', -1, 64)
+	src.scratch = strconv.AppendFloat(src.scratch[:0], float64(f), 'f', -1, 32)
 	return dst.Write(src.scratch)
 }
 
@@ -215,7 +215,7 @@ func rwFloat64(dst jsWriter, src *Reader) (int, error) {
 	if err != nil {
 		return 0, err
 	}
-	src.scratch = strconv.AppendFloat(src.scratch[:0], f, 'f', -1, 32)
+	src.scratch = strconv.AppendFloat(src.scratch[:0], f, 'f', -1, 64)
 	return dst.Write(src.scratch)
 }
 

diff --git a/msgp/json_test.go b/msgp/json_test.go
@@ -11,7 +11,8 @@ import (
 func TestCopyJSON(t *testing.T) {
 	var buf bytes.Buffer
 	enc := NewWriter(&buf)
-	enc.WriteMapHeader(5)
+	const mapLength = 6
+	enc.WriteMapHeader(mapLength)
 
 	enc.WriteString("thing_1")
 	enc.WriteString("a string object")
@@ -33,6 +34,9 @@ func TestCopyJSON(t *testing.T) {
 		"internal_one": "blah",
 		"internal_two": "blahhh...",
 	})
+	enc.WriteString("float64")
+	const encodedFloat64 = 1672209023
+	enc.WriteFloat64(encodedFloat64)
 	enc.Flush()
 
 	var js bytes.Buffer
@@ -47,8 +51,8 @@ func TestCopyJSON(t *testing.T) {
 		t.Fatalf("Error unmarshaling: %s", err)
 	}
 
-	if len(mp) != 5 {
-		t.Errorf("map length should be %d, not %d", 4, len(mp))
+	if len(mp) != mapLength {
+		t.Errorf("map length should be %d, not %d", mapLength, len(mp))
 	}
 
 	so, ok := mp["thing_1"]
@@ -68,6 +72,9 @@ func TestCopyJSON(t *testing.T) {
 			t.Errorf("inner map field %q should be %q, not %q", "internal_one", "blah", inm1)
 		}
 	}
+	if actual := mp["float64"]; float64(encodedFloat64) != actual.(float64) {
+		t.Errorf("expected %G, got %G", float64(encodedFloat64), actual)
+	}
 }
 
 // Encoder should generate valid utf-8 even if passed bad input