Smaller fixes

patriksimek · Oct 20, 2021 · d03f150 · d03f150
1 parent 8b9d039
commit d03f150
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/contextify.js b/lib/contextify.js
@@ -327,7 +327,7 @@ Decontextify.object = (object, traps, deepTraps, flags, mock) => {
 		let def;
 
 		try {
-			def = host.Object.getOwnPropertyDescriptor(object, prop);
+			def = local.Object.getOwnPropertyDescriptor(object, prop);
 		} catch (e) {
 			throw Decontextify.value(e);
 		}
@@ -358,7 +358,7 @@ Decontextify.object = (object, traps, deepTraps, flags, mock) => {
 		}
 		if (!desc.configurable) {
 			try {
-				def = host.Object.getOwnPropertyDescriptor(target, prop);
+				def = local.Object.getOwnPropertyDescriptor(target, prop);
 				if (!def || def.configurable || def.writable !== desc.writable) {
 					local.Reflect.defineProperty(target, prop, desc);
 				}

diff --git a/lib/sandbox.js b/lib/sandbox.js
@@ -68,7 +68,7 @@ return ((vm, host) => {
 
 					const code = host.STRICT_MODULE_PREFIX + contents + host.MODULE_SUFFIX;
 
-					const ccode = vm._hook('run', [code]);
+					const ccode = vm._hook('run', host.Array.of(code))[0];
 
 					// Precompile script
 					script = new Script(ccode, {
@@ -236,7 +236,11 @@ return ((vm, host) => {
 			return module.exports;
 		}
 
-		return Contextify.readonly(host.require(moduleName));
+		try {
+			return Contextify.readonly(host.require(moduleName));
+		} catch (e) {
+			throw new VMError(`Error loading '${moduleName}'`);
+		}
 	};
 
 	/**