Title: [228734] releases/WebKitGTK/webkit-2.20/Source/_javascript_Core
- Revision
- 228734
- Author
- carlo...@webkit.org
- Date
- 2018-02-19 23:26:38 -0800 (Mon, 19 Feb 2018)
Log Message
Merge r228388 - 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):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/ChangeLog (228733 => 228734)
--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/ChangeLog 2018-02-20 07:26:35 UTC (rev 228733)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/ChangeLog 2018-02-20 07:26:38 UTC (rev 228734)
@@ -1,3 +1,17 @@
+2018-02-12 Mark Lam <mark....@apple.com>
+
+ 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):
+
2018-02-08 Don Olmstead <don.olmst...@sony.com>
Remove _javascript_Core/ForwardingHeaders directory
Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/runtime/RegExpObject.cpp (228733 => 228734)
--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/runtime/RegExpObject.cpp 2018-02-20 07:26:35 UTC (rev 228733)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/runtime/RegExpObject.cpp 2018-02-20 07:26:38 UTC (rev 228734)
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1999-2000 Harri Porten (por...@kde.org)
- * 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
* modify it under the terms of the GNU Lesser General Public
@@ -258,8 +258,10 @@
RETURN_IF_EXCEPTION(scope, { });
String s = string->value(exec);
+ RETURN_IF_EXCEPTION(scope, { });
RegExpConstructor* regExpConstructor = globalObject->regExpConstructor();
-
+
+ ASSERT(!s.isNull());
if (regExp->unicode()) {
unsigned stringLength = s.length();
scope.release();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
