Add YarrSyntaxChecker to test RegExp pattern and flag

Signed-off-by: Seonghyun Kim <[email protected]>

src/parser/Lexer.cpp

@@ -1984,7 +1984,11 @@ void Scanner::scanRegExp(Scanner::ScannerResult* token)
 
     String* body = this->scanRegExpBody();
     String* flags = this->scanRegExpFlags();
-    // const value = this->testRegExp(body.value, flags.value);
+
+    auto error = RegExpObject::checkRegExpSyntax(body, flags);
+    if (UNLIKELY(error)) {
+        ErrorHandler::throwError(this->index, this->lineNumber, this->index - this->lineStart + 1, error.value(), ErrorCode::SyntaxError);
+    }
 
     ScanRegExpResult result;
     result.body = body;

src/runtime/RegExpObject.cpp

@@ -28,6 +28,7 @@
 #include "Yarr.h"
 #include "YarrPattern.h"
 #include "YarrInterpreter.h"
+#include "YarrSyntaxChecker.h"
 
 namespace Escargot {
 
@@ -578,6 +579,16 @@ Value RegExpObject::regexpFlagsValue(ExecutionState& state, Object* obj)
     }
 }
 
+Optional<String*> RegExpObject::checkRegExpSyntax(String* pattern, String* flags)
+{
+    JSC::Yarr::ErrorCode errorCode = JSC::Yarr::checkSyntax(pattern, flags);
+    if (errorCode != JSC::Yarr::ErrorCode::NoError) {
+        auto str = JSC::Yarr::errorMessage(errorCode);
+        return String::fromASCII(str, strlen(str));
+    }
+    return nullptr;
+}
+
 String* RegExpObject::computeRegExpOptionString(ExecutionState& state, Object* obj)
 {
     char flags[8] = { 0 };

src/runtime/RegExpObject.h

@@ -173,6 +173,8 @@ class RegExpObject : public DerivedObject {
     static String* computeRegExpOptionString(ExecutionState& state, Object* obj);
     static String* regexpSourceValue(ExecutionState& state, Object* obj);
     static Value regexpFlagsValue(ExecutionState& state, Object* obj);
+    // returns error string if there is error
+    static Optional<String*> checkRegExpSyntax(String* pattern, String* flags);
 
 protected:
     explicit RegExpObject(ExecutionState& state, Object* proto, bool hasLastIndex = true);

third_party/yarr/OptionSet.h

@@ -94,6 +94,24 @@ template<typename T> class OptionSet {
     constexpr iterator begin() const { return m_storage; }
     constexpr iterator end() const { return 0; }
 
+    void add(OptionSet optionSet)
+    {
+        m_storage |= optionSet.m_storage;
+    }
+
+    void remove(OptionSet optionSet)
+    {
+        m_storage &= ~optionSet.m_storage;
+    }
+
+    void set(OptionSet optionSet, bool value)
+    {
+        if (value)
+            add(optionSet);
+        else
+            remove(optionSet);
+    }
+
     constexpr bool contains(OptionSet optionSet) const
     {
         return m_storage & optionSet.m_storage;

third_party/yarr/YarrFlags.cpp

@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2019 Sony Interactive Entertainment Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "WTFBridge.h"
+#include "YarrFlags.h"
+
+namespace JSC { namespace Yarr {
+
+Optional<OptionSet<Flags>> parseFlags(StringView string)
+{
+    OptionSet<Flags> flags;
+
+    for (size_t i = 0; i < string.length(); i ++) {
+        char16_t character = string[i];
+        switch (character) {
+#define JSC_HANDLE_REGEXP_FLAG(key, name, lowerCaseName, _) \
+        case key: \
+            if (flags.contains(Flags::name)) \
+                return nullptr; \
+            flags.add(Flags::name); \
+            break;
+
+        JSC_REGEXP_FLAGS(JSC_HANDLE_REGEXP_FLAG)
+
+#undef JSC_HANDLE_REGEXP_FLAG
+
+        default:
+            return nullptr;
+        }
+    }
+
+    // Can only specify one of 'u' and 'v' flags.
+    if (flags.contains(Flags::Unicode) && flags.contains(Flags::UnicodeSets))
+        return nullptr;
+
+    return flags;
+}
+
+} } // namespace JSC::Yarr

third_party/yarr/YarrFlags.h

@@ -50,4 +50,6 @@ enum class Flags : uint16_t {
     DeletedValue = 1 << numberOfFlags,
 };
 
+JS_EXPORT_PRIVATE Optional<OptionSet<Flags>> parseFlags(StringView);
+
 } } // namespace JSC::Yarr

third_party/yarr/YarrSyntaxChecker.cpp

@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2011, 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#include "WTFBridge.h"
+#include "YarrSyntaxChecker.h"
+
+#include "YarrFlags.h"
+#include "YarrParser.h"
+
+namespace JSC { namespace Yarr {
+
+class SyntaxChecker {
+public:
+    void assertionBOL() { }
+    void assertionEOL() { }
+    void assertionWordBoundary(bool) { }
+    void atomPatternCharacter(char32_t) { }
+    void atomBuiltInCharacterClass(BuiltInCharacterClassID, bool) { }
+    void atomCharacterClassBegin(bool = false) { }
+    void atomCharacterClassAtom(UChar) { }
+    void atomCharacterClassRange(UChar, UChar) { }
+    void atomCharacterClassBuiltIn(BuiltInCharacterClassID, bool) { }
+    void atomClassStringDisjunction(Vector<Vector<char32_t>>&) { }
+    void atomCharacterClassSetOp(CharacterClassSetOp) { }
+    void atomCharacterClassPushNested() { }
+    void atomCharacterClassPopNested() { }
+    void atomCharacterClassEnd() { }
+    void atomParenthesesSubpatternBegin(bool = true, Optional<String> = nullptr) { }
+    void atomParentheticalAssertionBegin(bool, MatchDirection) { }
+    void atomParenthesesEnd() { }
+    void atomBackReference(unsigned) { }
+    void atomNamedBackReference(const String&) { }
+    void atomNamedForwardReference(const String&) { }
+    void quantifyAtom(unsigned, unsigned, bool) { }
+    void disjunction(CreateDisjunctionPurpose) { }
+    void resetForReparsing() { }
+};
+
+ErrorCode checkSyntax(StringView pattern, StringView flags)
+{
+    SyntaxChecker syntaxChecker;
+
+    auto parsedFlags = parseFlags(flags);
+    if (!parsedFlags)
+        return ErrorCode::InvalidRegularExpressionFlags;
+
+    return parse(syntaxChecker, pattern, compileMode(parsedFlags));
+}
+
+}} // JSC::Yarr

third_party/yarr/YarrSyntaxChecker.h

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2011 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#pragma once
+
+#include "YarrErrorCode.h"
+
+namespace JSC { namespace Yarr {
+
+ErrorCode checkSyntax(StringView pattern, StringView flags);
+
+}} // JSC::Yarr