RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 17:07:46 +00:00
Code Issues Activity Actions

AK: Fix print_double

Browse source 
Fixes #2776.

This fixes, among other things, JSON serialization.

The underlying bug was that 'print_double' defined fraction_length
as a function argument with a default value, whereas
printf_internal *always* provided a value, even if nothing was read.
The 'use 6 by default' logic has been moved to printf_internal instead.
This commit is contained in:
Ben Wiederhake 2020-07-25 07:22:29 +02:00 • committed by Andreas Kling
parent 9685080bd4
commit 8c14219fb1
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
AK/PrintfImplementation.h
View file

@ -178,7 +178,7 @@ ALWAYS_INLINE int print_u64(PutChFunc putch, char*& bufptr, u64 number, bool lef
} }
template<typename PutChFunc> template<typename PutChFunc>
ALWAYS_INLINE int print_double(PutChFunc putch, char*& bufptr, double number, bool left_pad, bool zero_pad, u32 field_width, u32 fraction_length = 6) ALWAYS_INLINE int print_double(PutChFunc putch, char*& bufptr, double number, bool left_pad, bool zero_pad, u32 field_width, u32 fraction_length)
{ {
int length = 0; int length = 0;
@ -296,7 +296,8 @@ ALWAYS_INLINE int printf_internal(PutChFunc putch, char* buffer, const char*& fm
bool zero_pad = false; bool zero_pad = false;
bool dot = false; bool dot = false;
unsigned field_width = 0; unsigned field_width = 0;
unsigned fraction_length = 0; bool has_fraction_length = false;
unsigned fraction_length = 6;
unsigned long_qualifiers = 0; unsigned long_qualifiers = 0;
bool size_qualifier = false; bool size_qualifier = false;
(void)size_qualifier; (void)size_qualifier;
@ -332,6 +333,10 @@ ALWAYS_INLINE int printf_internal(PutChFunc putch, char* buffer, const char*& fm
if (*(p + 1)) if (*(p + 1))
goto one_more; goto one_more;
} else { } else {
if (!has_fraction_length) {
has_fraction_length = true;
fraction_length = 0;
}
fraction_length *= 10; fraction_length *= 10;
fraction_length += *p - '0'; fraction_length += *p - '0';
if (*(p + 1)) if (*(p + 1))