Changeset 274806 in webkit for trunk/Source/JavaScriptCore/yarr/YarrInterpreter.cpp

Timestamp:

Mar 22, 2021, 3:06:52 PM (4 years ago)

Author:

[email protected]

Message:

[YARR] Interpreter incorrectly matches non-BMP characters with multiple .
​https://bugs.webkit.org/show_bug.cgi?id=223498

Reviewed by Yusuke Suzuki.

JSTests:

New test.

• stress/regexp-dot-match-nonBMP.js: Added.

(shouldMatch):
(shouldntMatch):

Source/JavaScriptCore:

We need to check that we read an actual character before seeing if it is part of a character class.
In the case where we are checking that a character is not in a character class, like .,
the failed to read result from input.readChecked(), -1, is not part of the newline character class.
This will allow regular expressions that require more than the number of characters in a string
to match.

• yarr/YarrInterpreter.cpp:

(JSC::Yarr::Interpreter::checkCharacterClass):

LayoutTests:

Updated test.

• fast/forms/ValidityState-patternMismatch-expected.txt:
• fast/forms/ValidityState-patternMismatch.html:

File:

• trunk/Source/JavaScriptCore/yarr/YarrInterpreter.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/yarr/YarrInterpreter.cpp

@@ -426 +426 @@
     bool checkCharacterClass(CharacterClass* characterClass, bool invert, unsigned negativeInputOffset)
     {
-        bool match = testCharacterClass(characterClass, input.readChecked(negativeInputOffset));
+        int inputChar = input.readChecked(negativeInputOffset);
+        if (inputChar < 0)
+            return false;
+
+        bool match = testCharacterClass(characterClass, inputChar);
         return invert ? !match : match;
     }