Skip to content

Commit 515344b

Browse files
Merge pull request #150 from oven-sh/ali/abstract-module-record-missing-exception-check
a couple of missing exception checks
2 parents 596e48e + 3712974 commit 515344b

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Source/JavaScriptCore/runtime/AbstractModuleRecord.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ auto AbstractModuleRecord::resolveImport(JSGlobalObject* globalObject, const Ide
199199

200200
AbstractModuleRecord* importedModule = hostResolveImportedModule(globalObject, importEntry.moduleRequest);
201201
RETURN_IF_EXCEPTION(scope, Resolution::error());
202-
return importedModule->resolveExport(globalObject, importEntry.importName);
202+
RELEASE_AND_RETURN(scope, importedModule->resolveExport(globalObject, importEntry.importName));
203203
}
204204

205205
struct AbstractModuleRecord::ResolveQuery {

Source/JavaScriptCore/runtime/JSModuleNamespaceObject.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,7 @@ bool JSModuleNamespaceObject::overrideExportValue(JSGlobalObject* globalObject,
381381
auto scope = DECLARE_THROW_SCOPE(vm);
382382
JSC::Identifier identifier = Identifier::fromUid(vm, name.uid());
383383
auto resolution = moduleRecord()->resolveExport(globalObject, identifier);
384+
RETURN_IF_EXCEPTION(scope, false);
384385

385386
// FIXME: figure out how to do this
386387
// Support setting a default export value when it wasn't already exported.

0 commit comments

Comments
 (0)