RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 19:37:35 +00:00
Code Issues Activity Actions

LibXML: Fail gracefully on integer overflow in character references

Browse source 
Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=47738
This commit is contained in:
Idan Horowitz 2022-07-10 19:48:02 +03:00
parent 1d96c30488
commit 18d25124bf
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Tests/LibXML/TestParser.cpp
View file

@ -20,3 +20,12 @@ TEST_CASE(char_data_ending)
return Test::Crash::Failure::DidNotCrash; return Test::Crash::Failure::DidNotCrash;
}); });
} }
TEST_CASE(character_reference_integer_overflow)
{
EXPECT_NO_CRASH("parsing character references that do not fit in 32 bits should not crash", [] {
XML::Parser parser("<G>&#6666666666");
(void)parser.parse();
return Test::Crash::Failure::DidNotCrash;
});
}

10
Userland/Libraries/LibXML/Parser/Parser.cpp
View file

@ -758,26 +758,26 @@ ErrorOr<Variant<Parser::EntityReference, String>, ParseError> Parser::parse_refe
auto name_result = parse_name(); auto name_result = parse_name();
if (name_result.is_error()) { if (name_result.is_error()) {
TRY(expect("#")); TRY(expect("#"));
u32 code_point; Optional<u32> code_point;
if (m_lexer.consume_specific('x')) { if (m_lexer.consume_specific('x')) {
auto hex = TRY(expect_many( auto hex = TRY(expect_many(
ranges_for_search<Range('0', '9'), Range('a', 'f'), Range('A', 'F')>(), ranges_for_search<Range('0', '9'), Range('a', 'f'), Range('A', 'F')>(),
"any of [0-9a-fA-F]")); "any of [0-9a-fA-F]"));
code_point = *AK::StringUtils::convert_to_uint_from_hex<u32>(hex); code_point = AK::StringUtils::convert_to_uint_from_hex<u32>(hex);
} else { } else {
auto decimal = TRY(expect_many( auto decimal = TRY(expect_many(
ranges_for_search<Range('0', '9')>(), ranges_for_search<Range('0', '9')>(),
"any of [0-9]")); "any of [0-9]"));
code_point = *decimal.to_uint<u32>(); code_point = decimal.to_uint<u32>();
} }
if (!s_characters.contains(code_point)) if (!code_point.has_value() || !s_characters.contains(*code_point))
return parse_error(reference_start, "Invalid character reference"); return parse_error(reference_start, "Invalid character reference");
TRY(expect(";")); TRY(expect(";"));
StringBuilder builder; StringBuilder builder;
builder.append_code_point(code_point); builder.append_code_point(*code_point);
rollback.disarm(); rollback.disarm();
return builder.to_string(); return builder.to_string();