Changeset 229129 in webkit for trunk/Source/JavaScriptCore/jsc.cpp

Timestamp:

Mar 1, 2018, 2:24:33 AM (7 years ago)

Author:

Yusuke Suzuki

Message:

Unreviewed, fix exception check for ExceptionScope
​https://bugs.webkit.org/show_bug.cgi?id=183175

• jsc.cpp:

(GlobalObject::moduleLoaderFetch):

File:

• trunk/Source/JavaScriptCore/jsc.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/jsc.cpp

@@ -974 +974 @@
     // 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)));