From dd19b876d4c9a604946f6c4e39cc4eac5f12cfb9 Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Fri, 16 Jun 2017 12:30:08 -0400 Subject: [PATCH] Raise the number of digits used for floats. About 1.5% of all IEEE754 single-precision numbers require nine decimal digits to represent accurately. --- conformance/conformance_test.cc | 1 + conformance/failure_list_ruby.txt | 1 + src/google/protobuf/stubs/strutil.cc | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conformance/conformance_test.cc b/conformance/conformance_test.cc index 0dd7787c0c..a899435d77 100644 --- a/conformance/conformance_test.cc +++ b/conformance/conformance_test.cc @@ -759,6 +759,7 @@ bool ConformanceTestSuite::RunSuite(ConformanceTestRunner* runner, }); TestValidDataForType(FieldDescriptor::TYPE_FLOAT, { {flt(0.1), "0.1"}, + {flt(1.00000075e-36), "1.00000075e-36"}, {flt(3.402823e+38), "3.402823e+38"}, // 3.40282347e+38 {flt(1.17549435e-38f), "1.17549435e-38"} }); diff --git a/conformance/failure_list_ruby.txt b/conformance/failure_list_ruby.txt index 1de6c4390c..4bac533e38 100644 --- a/conformance/failure_list_ruby.txt +++ b/conformance/failure_list_ruby.txt @@ -199,5 +199,6 @@ Required.ProtobufInput.DoubleFieldNormalizeQuietNan.JsonOutput Required.ProtobufInput.DoubleFieldNormalizeSignalingNan.JsonOutput Required.ProtobufInput.FloatFieldNormalizeQuietNan.JsonOutput Required.ProtobufInput.FloatFieldNormalizeSignalingNan.JsonOutput +Required.ProtobufInput.ValidDataRepeated.FLOAT.JsonOutput Required.TimestampProtoInputTooLarge.JsonOutput Required.TimestampProtoInputTooSmall.JsonOutput diff --git a/src/google/protobuf/stubs/strutil.cc b/src/google/protobuf/stubs/strutil.cc index 336894b52b..1a4d71c822 100644 --- a/src/google/protobuf/stubs/strutil.cc +++ b/src/google/protobuf/stubs/strutil.cc @@ -1401,7 +1401,7 @@ char* FloatToBuffer(float value, char* buffer) { float parsed_value; if (!safe_strtof(buffer, &parsed_value) || parsed_value != value) { int snprintf_result = - snprintf(buffer, kFloatToBufferSize, "%.*g", FLT_DIG+2, value); + snprintf(buffer, kFloatToBufferSize, "%.*g", FLT_DIG+3, value); // Should never overflow; see above. GOOGLE_DCHECK(snprintf_result > 0 && snprintf_result < kFloatToBufferSize);