Changeset 228388 in webkit for trunk/Source/JavaScriptCore/runtime/RegExpObject.cpp

Timestamp:

Feb 12, 2018, 12:28:02 PM (7 years ago)

Author:

[email protected]

Message:

Fix missing exception check in RegExpObject::matchGlobal().
​https://bugs.webkit.org/show_bug.cgi?id=182701
<rdar://problem/37465865>

Reviewed by Michael Saboff.

This issue was discovered when running JSC tests on an asm LLInt build with
JSC_useJIT=false.

• runtime/RegExpObject.cpp:

(JSC::RegExpObject::matchGlobal):

File:

• trunk/Source/JavaScriptCore/runtime/RegExpObject.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/RegExpObject.cpp

@@ -1 +1 @@
 /*
  *  Copyright (C) 1999-2000 Harri Porten ([email protected])
- *  Copyright (C) 2003-2017 Apple Inc. All Rights Reserved.
+ *  Copyright (C) 2003-2018 Apple Inc. All Rights Reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -259 +259 @@
 
     String s = string->value(exec);
+    RETURN_IF_EXCEPTION(scope, { });
     RegExpConstructor* regExpConstructor = globalObject->regExpConstructor();
-    
+
+    ASSERT(!s.isNull());
     if (regExp->unicode()) {
         unsigned stringLength = s.length();