system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 02:26:11 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

AK: printf was not accounting for plus sign with "%+d"

Browse source 
We have to include the plus sign in the number of characters written,
otherwise sprintf() will put the null terminator too early.
This commit is contained in:
Andreas Kling 2020-11-05 10:50:19 +01:00
parent eed78ffa5a
commit e9403e2b03
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AK/PrintfImplementation.h
View file

@ -284,7 +284,7 @@ ALWAYS_INLINE int print_signed_number(PutChFunc putch, char*& bufptr, int number
}
if (always_sign)
putch(bufptr, '+');
return print_number(putch, bufptr, number, left_pad, zero_pad, field_width);
return print_number(putch, bufptr, number, left_pad, zero_pad, field_width) + always_sign;
}
struct ModifierState {

14
AK/Tests/TestString.cpp
View file

@ -242,4 +242,18 @@ TEST_CASE(builder_zero_initial_capacity)
EXPECT_EQ(built.length(), 0u);
}
TEST_CASE(sprintf)
{
char buf1[128];
int ret1 = sprintf(buf1, "%+d", 12);
EXPECT_EQ(ret1, 3);
char buf2[128];
int ret2 = sprintf(buf2, "%+d", -12);
EXPECT_EQ(ret2, 3);
EXPECT_EQ(String(buf1), String("+12"));
EXPECT_EQ(String(buf2), String("-12"));
}
TEST_MAIN(String)