Title: [229265] releases/WebKitGTK/webkit-2.20/Source/_javascript_Core
- Revision
- 229265
- Author
- [email protected]
- Date
- 2018-03-05 05:16:10 -0800 (Mon, 05 Mar 2018)
Log Message
Merge r229129 - Unreviewed, fix exception check for ExceptionScope
https://bugs.webkit.org/show_bug.cgi?id=183175
* jsc.cpp:
(GlobalObject::moduleLoaderFetch):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/ChangeLog (229264 => 229265)
--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/ChangeLog 2018-03-05 13:16:04 UTC (rev 229264)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/ChangeLog 2018-03-05 13:16:10 UTC (rev 229265)
@@ -1,3 +1,11 @@
+2018-03-01 Yusuke Suzuki <[email protected]>
+
+ Unreviewed, fix exception check for ExceptionScope
+ https://bugs.webkit.org/show_bug.cgi?id=183175
+
+ * jsc.cpp:
+ (GlobalObject::moduleLoaderFetch):
+
2018-02-28 Dominik Infuehr <[email protected]>
[ARM] Fix compile error in debug builds by invoking unpoisoned().
Modified: releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/jsc.cpp (229264 => 229265)
--- releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/jsc.cpp 2018-03-05 13:16:04 UTC (rev 229264)
+++ releases/WebKitGTK/webkit-2.20/Source/_javascript_Core/jsc.cpp 2018-03-05 13:16:10 UTC (rev 229265)
@@ -973,8 +973,11 @@
// Here, now we consider moduleKey as the fileName.
Vector<char> utf8;
- if (!fetchModuleFromLocalFileSystem(moduleKey, utf8))
- return deferred->reject(exec, createError(exec, makeString("Could not open file '", moduleKey, "'.")));
+ if (!fetchModuleFromLocalFileSystem(moduleKey, utf8)) {
+ auto result = deferred->reject(exec, createError(exec, makeString("Could not open file '", moduleKey, "'.")));
+ scope.releaseAssertNoException();
+ return result;
+ }
auto result = deferred->resolve(exec, JSSourceCode::create(vm, makeSource(stringFromUTF(utf8), SourceOrigin { moduleKey }, moduleKey, TextPosition(), SourceProviderSourceType::Module)));
scope.releaseAssertNoException();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
