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

LibJS: Reorder parsing for TimeSpecWithOptionalTimeZoneNotAmbiguous

Browse source 
Because `TimeHour TimeZoneNumericUTCOffsetNotAmbiguous[opt]
TimeZoneBracketedAnnotation[opt]` can be a subset of
`TimeHourNotValidMonth TimeZone` we would not exhaust the whole input
in some cases, which would result in an incorrectly thrown exception.
This commit is contained in:
Idan Horowitz 2022-04-30 19:29:56 +03:00 • committed by Linus Groh
parent 0866a0cd1e
commit 7ac9900023
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Libraries/LibJS/Runtime/Temporal/ISO8601.cpp
View file

@ -1149,6 +1149,15 @@ bool ISO8601Parser::parse_time_spec_with_optional_time_zone_not_ambiguous()
// TimeHour : TimeMinute : TimeSecond TimeFraction[opt] TimeZone[opt] // TimeHour : TimeMinute : TimeSecond TimeFraction[opt] TimeZone[opt]
// TimeHour TimeMinute TimeSecondNotValidMonth TimeZone[opt] // TimeHour TimeMinute TimeSecondNotValidMonth TimeZone[opt]
// TimeHour TimeMinute TimeSecond TimeFraction TimeZone[opt] // TimeHour TimeMinute TimeSecond TimeFraction TimeZone[opt]
// NOTE: Reverse order here because `TimeHour TimeZoneNumericUTCOffsetNotAmbiguous[opt] TimeZoneBracketedAnnotation[opt]` can
// be a subset of `TimeHourNotValidMonth TimeZone`, so we'd not attempt to parse that but may not exhaust the input string.
{
StateTransaction transaction { *this };
if (parse_time_hour_not_valid_month() && parse_time_zone()) {
transaction.commit();
return true;
}
}
{ {
StateTransaction transaction { *this }; StateTransaction transaction { *this };
if (parse_time_hour()) { if (parse_time_hour()) {
@ -1194,13 +1203,6 @@ bool ISO8601Parser::parse_time_spec_with_optional_time_zone_not_ambiguous()
} }
} }
} }
{
StateTransaction transaction { *this };
if (parse_time_hour_not_valid_month() && parse_time_zone()) {
transaction.commit();
return true;
}
}
{ {
StateTransaction transaction { *this }; StateTransaction transaction { *this };
if (parse_time_hour_minute_basic_format_not_ambiguous()) { if (parse_time_hour_minute_basic_format_not_ambiguous()) {