Skip to content

[JSC] Reject dangling hyphen in class set under /v flag #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
robobun wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −3
Open

[JSC] Reject dangling hyphen in class set under /v flag #180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions Source/JavaScriptCore/yarr/YarrParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,14 @@ class Parser {
if (m_state == ClassSetConstructionState::CachedCharacter) {
m_delegate.atomCharacterClassAtom(m_character);
m_state = ClassSetConstructionState::Empty;
} else if (m_state == ClassSetConstructionState::CachedCharacterHyphen
|| m_state == ClassSetConstructionState::AfterCharacterClassHyphen) {
// A '-' is a ClassSetSyntaxCharacter in /v and is only legal
// between two ClassSetCharacters as part of a ClassSetRange.
// Reaching any other transition (nested class, set operator,
// end of class) while a hyphen is pending means the range
// has no right-hand side — reject it.
m_errorCode = ErrorCode::InvalidClassSetCharacter;
}
}

Expand Down Expand Up @@ -757,9 +765,13 @@ class Parser {
{
if (m_state == ClassSetConstructionState::CachedCharacter)
m_delegate.atomCharacterClassAtom(m_character);
else if (m_state == ClassSetConstructionState::CachedCharacterHyphen) {
m_delegate.atomCharacterClassAtom(m_character);
m_delegate.atomCharacterClassAtom('-');
else if (m_state == ClassSetConstructionState::CachedCharacterHyphen
|| m_state == ClassSetConstructionState::AfterCharacterClassHyphen) {
// A trailing '-' in /v mode (e.g. /[a-]/v, /[\d-]/v) leaves a
// ClassSetRange with no right-hand side. '-' is a
// ClassSetSyntaxCharacter that must be escaped unless it
// forms a full range, so this is a syntax error.
m_errorCode = ErrorCode::InvalidClassSetCharacter;
} else if (m_state == ClassSetConstructionState::AfterSetOperator)
m_errorCode = ErrorCode::InvalidClassSetCharacter;

Expand Down