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

Timestamp:

Mar 24, 2021, 10:29:02 AM (4 years ago)

Author:

[email protected]

Message:

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

Reviewed by Mark Lam.

JSTests:

Added tests for dotAll. Also made sure that we test both JIT and non-JIT execution.

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

Source/JavaScriptCore:

In checkCharacterClassDontAdvanceInputForNonBMP(), we need to check for input.readChecked() returning -1
and return that the character class didn't match.

• yarr/YarrInterpreter.cpp:

(JSC::Yarr::Interpreter::checkCharacterClassDontAdvanceInputForNonBMP):

File:

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

trunk/Source/JavaScriptCore/yarr/YarrInterpreter.cpp

@@ -437 +437 @@
     {
         int readCharacter = characterClass->hasOnlyNonBMPCharacters() ? input.readSurrogatePairChecked(negativeInputOffset) :  input.readChecked(negativeInputOffset);
+        if (readCharacter < 0)
+            return false;
+
         return testCharacterClass(characterClass, readCharacter);
     }