LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-11 05:25:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

AK: Avoid overflow when passing i64 minimum value to vformat()

Browse Source
This commit is contained in:
Tim Ledbetter 2023-10-08 17:53:10 +01:00 committed by Ali Mohammad Pur
parent 2ea45f4881
commit f10db48bab
Notes: sideshowbarker 2024-07-17 04:21:32 +09:00 
Author: https://github.com/tcl3
Commit: https://github.com/SerenityOS/serenity/commit/f10db48bab
Pull-request: https://github.com/SerenityOS/serenity/pull/21384
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
AK/Format.cpp
View File

@ -363,9 +363,14 @@ ErrorOr<void> FormatBuilder::put_i64(
SignMode sign_mode)
{
auto const is_negative = value < 0;
value = is_negative ? -value : value;
u64 positive_value;
if (value == NumericLimits<i64>::min()) {
positive_value = static_cast<u64>(NumericLimits<i64>::max()) + 1;
} else {
positive_value = is_negative ? -value : value;
}
TRY(put_u64(static_cast<u64>(value), base, prefix, upper_case, zero_pad, use_separator, align, min_width, fill, sign_mode, is_negative));
TRY(put_u64(positive_value, base, prefix, upper_case, zero_pad, use_separator, align, min_width, fill, sign_mode, is_negative));
return {};
}

2
Tests/AK/TestFormat.cpp
View File

@ -35,6 +35,8 @@ TEST_CASE(format_integers)
EXPECT_EQ(DeprecatedString::formatted("{:08x}", 4096), "00001000");
EXPECT_EQ(DeprecatedString::formatted("{:x}", 0x1111222233334444ull), "1111222233334444");
EXPECT_EQ(DeprecatedString::formatted("{:4}", 12345678), "12345678");
EXPECT_EQ(DeprecatedString::formatted("{}", AK::NumericLimits<i64>::min()), "-9223372036854775808");
EXPECT_EQ(DeprecatedString::formatted("{:x}", AK::NumericLimits<i64>::min()), "-8000000000000000");
EXPECT_EQ(DeprecatedString::formatted("{:'}", 0), "0");
EXPECT_EQ(DeprecatedString::formatted("{:'}", 4096), "4,096");
EXPECT_EQ(DeprecatedString::formatted("{:'}", 16777216), "16,777,216");