beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 07:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibRegex: Avoid calling GenericLexer::consume() past EOF

Browse source 
The consume(size_t) overload consumes "at most" as many bytes as
requested, but consume() consumes exactly one byte.
This commit makes sure to avoid consuming past EOF.

Fixes #18324.
Fixes #18325.
This commit is contained in:
Ali Mohammad Pur 2023-04-13 21:12:59 +03:30 committed by Andreas Kling
parent 821702fadd
commit eba466b8e7
Notes: sideshowbarker 2024-07-16 21:28:59 +09:00 
Author: https://github.com/alimpfard
Commit: https://github.com/SerenityOS/serenity/commit/eba466b8e7
Pull-request: https://github.com/SerenityOS/serenity/pull/18353
Issue: https://github.com/SerenityOS/serenity/issues/18324
Issue: https://github.com/SerenityOS/serenity/issues/18325
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Tests/LibRegex/Regex.cpp
View file

@ -606,6 +606,8 @@ TEST_CASE(ECMA262_parse)
{ "((?=lg)?[vl]k\\-?\\d{3}) bui| 3\\.[-\\w; ]{10}lg?-([06cv9]{3,4})"sv, regex::Error::NoError, ECMAScriptFlags::BrowserExtended }, // #12373, quantifiable assertions.
{ parse_test_case_long_disjunction_chain.view() }, // A whole lot of disjunctions, should not overflow the stack.
{ "(\"|')(?:(?!\\2)[^\\\\\\r\\n]|\\\\.)*\\2"sv, regex::Error::NoError, ECMAScriptFlags::BrowserExtended }, // LegacyOctalEscapeSequence should not consume too many chars (and should not crash)
// #18324, Capture group counter skipped past EOF.
{ "\\1[\\"sv, regex::Error::InvalidNumber },
};
for (auto& test : tests) {

7
Userland/Libraries/LibRegex/RegexParser.cpp
View file

@ -2695,17 +2695,22 @@ size_t ECMA262Parser::ensure_total_number_of_capturing_parenthesis()
while (!lexer.is_eof()) {
switch (lexer.peek()) {
case '\\':
lexer.consume(2);
lexer.consume(min(lexer.tell_remaining(), 2));
continue;
case '[':
while (!lexer.is_eof()) {
if (lexer.consume_specific('\\')) {
if (lexer.is_eof())
break;
lexer.consume();
continue;
}
if (lexer.consume_specific(']')) {
break;
}
if (lexer.is_eof())
break;
lexer.consume();
}
break;