fix: properly handle CR character

go-faster · Jul 20, 2023 · c7bc3f6 · c7bc3f6
1 parent 17ee314
commit c7bc3f6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/dec_float.go b/dec_float.go
@@ -30,10 +30,11 @@ func init() {
 	floatDigits[','] = endOfNumber
 	floatDigits[']'] = endOfNumber
 	floatDigits['}'] = endOfNumber
-	floatDigits[' '] = endOfNumber
-	floatDigits['\t'] = endOfNumber
-	floatDigits['\n'] = endOfNumber
-
+	for ch, isSpace := range spaceSet {
+		if isSpace == 1 {
+			floatDigits[ch] = endOfNumber
+		}
+	}
 	for i := int8('0'); i <= int8('9'); i++ {
 		floatDigits[i] = i - int8('0')
 	}

diff --git a/int_test.go b/int_test.go
@@ -434,12 +434,13 @@ func TestReadInt64(t *testing.T) {
 		`12345678901`,
 		`9223372036854775807`,
 		`-9223372036854775808`,
+		"-9223372036854775808\r",
 	}
 	for i, input := range inputs {
 		input := input
 		t.Run(fmt.Sprintf("Test%d", i+1), createTestCase(input, func(t *testing.T, d *Decoder) error {
 			should := require.New(t)
-			expected, err := strconv.ParseInt(input, 10, 64)
+			expected, err := strconv.ParseInt(strings.Trim(input, "\r"), 10, 64)
 			should.NoError(err)
 			v, err := d.Int64()
 			should.NoError(err)
@@ -455,7 +456,7 @@ func TestReadInt64(t *testing.T) {
 			i := 0
 
 			return d.Arr(func(d *Decoder) error {
-				expected, err := strconv.ParseInt(inputs[i], 10, 64)
+				expected, err := strconv.ParseInt(strings.Trim(inputs[i], "\r"), 10, 64)
 				should.NoError(err)
 
 				v, err := d.Int64()