Changeset 274945 in webkit

Timestamp:

Mar 24, 2021 10:29:02 AM (16 months ago)

Author:

msaboff@apple.com

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):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/regexp-dot-match-nonBMP.js (modified) (2 diffs)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/yarr/YarrInterpreter.cpp (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2021-03-24  Michael Saboff  <msaboff@apple.com>
+
+        [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.
+
+        Added tests for dotAll.  Also made sure that we test both JIT and non-JIT execution.
+
+        * stress/regexp-dot-match-nonBMP.js:
+
 2021-03-24  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/JSTests/stress/regexp-dot-match-nonBMP.js

@@ +1 @@
+//@ runDefault
+//@ runNoJIT
+
 function shouldMatch(regexp, str) {
     let result = regexp.test(str);
@@ -19 +22 @@
 shouldntMatch(/.../, s);
 shouldntMatch(/.../u, s);
+
+shouldMatch(/./s, s);
+shouldMatch(/./su, s);
+shouldMatch(/../s, s);
+shouldntMatch(/../su, s);
+shouldntMatch(/.../s, s);
+shouldntMatch(/.../su, s);

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-03-24  Michael Saboff  <msaboff@apple.com>
+
+        [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.
+
+        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):
+
 2021-03-24  Saam Barati  <sbarati@apple.com>
 

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);
     }