vm: refactor to avoid unsafe array iteration

aduh95 · targos · commit 3aee77d27912 · 2021-06-11T09:29:55.000+02:00
PR-URL: #36752 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/lib/internal/vm/module.js b/lib/internal/vm/module.js
@@ -11,6 +11,7 @@ const {
 ObjectGetPrototypeOf,
 ObjectSetPrototypeOf,
 PromiseAll,
+ ReflectApply,
 SafeWeakMap,
 Symbol,
 SymbolToStringTag,
@@ -447,7 +448,7 @@ class SyntheticModule extends Module {
 
 function importModuleDynamicallyWrap(importModuleDynamically) {
 const importModuleDynamicallyWrapper = async (...args) => {
- const m = await importModuleDynamically(...args);
+ const m = await ReflectApply(importModuleDynamically, this, args);
 if (isModuleNamespaceObject(m)) {
 return m;
 }
diff --git a/lib/vm.js b/lib/vm.js
@@ -23,6 +23,7 @@
 
 const {
 ArrayPrototypeForEach,
+ ArrayPrototypeUnshift,
 Symbol,
 PromiseReject,
 ReflectApply,
@@ -130,17 +131,17 @@ class Script extends ContextifyScript {
 if (breakOnSigint && process.listenerCount('SIGINT') > 0) {
 return sigintHandlersWrap(super.runInThisContext, this, args);
 }
- return super.runInThisContext(...args);
+ return ReflectApply(super.runInThisContext, this, args);
 }
 
 runInContext(contextifiedObject, options) {
 validateContext(contextifiedObject);
 const { breakOnSigint, args } = getRunInContextArgs(options);
+ ArrayPrototypeUnshift(args, contextifiedObject);
 if (breakOnSigint && process.listenerCount('SIGINT') > 0) {
- return sigintHandlersWrap(super.runInContext, this,
- [contextifiedObject, ...args]);
+ return sigintHandlersWrap(super.runInContext, this, args);
 }
- return super.runInContext(contextifiedObject, ...args);
+ return ReflectApply(super.runInContext, this, args);
 }
 
 runInNewContext(contextObject, options) {
@@ -274,9 +275,9 @@ function sigintHandlersWrap(fn, thisArg, argsArray) {
 } finally {
 // Add using the public methods so that the `newListener` handler of
 // process can re-attach the listeners.
- for (const listener of sigintListeners) {
+ ArrayPrototypeForEach(sigintListeners, (listener) => {
 process.addListener('SIGINT', listener);
- }
+ });
 }
 }
 

-Original file line number
+Diff line change
  ObjectGetPrototypeOf,
  ObjectSetPrototypeOf,
  PromiseAll,
 + ReflectApply,
  SafeWeakMap,
  Symbol,
  SymbolToStringTag,
 functionimportModuleDynamicallyWrap(importModuleDynamically){
 constimportModuleDynamicallyWrapper=async(...args)=>{
 -constm=awaitimportModuleDynamically(...args);
 +constm=awaitReflectApply(importModuleDynamically,this,args);
 if(isModuleNamespaceObject(m)){
 returnm;
+}
-Original file line number
+Diff line change
 const{
  ArrayPrototypeForEach,
 + ArrayPrototypeUnshift,
  Symbol,
  PromiseReject,
  ReflectApply,
 if(breakOnSigint&&process.listenerCount('SIGINT')>0){
 returnsigintHandlersWrap(super.runInThisContext,this,args);
+}
 -returnsuper.runInThisContext(...args);
 +returnReflectApply(super.runInThisContext,this,args);
+}
 runInContext(contextifiedObject,options){
 validateContext(contextifiedObject);
 const{ breakOnSigint, args }=getRunInContextArgs(options);
 +ArrayPrototypeUnshift(args,contextifiedObject);
 if(breakOnSigint&&process.listenerCount('SIGINT')>0){
 -returnsigintHandlersWrap(super.runInContext,this,
 -[contextifiedObject, ...args]);
 +returnsigintHandlersWrap(super.runInContext,this,args);
+}
 -returnsuper.runInContext(contextifiedObject, ...args);
 +returnReflectApply(super.runInContext,this,args);
+}
 runInNewContext(contextObject,options){
 }finally{
 // Add using the public methods so that the `newListener` handler of
 // process can re-attach the listeners.
 -for(constlistenerofsigintListeners){
 +ArrayPrototypeForEach(sigintListeners,(listener)=>{
 process.addListener('SIGINT',listener);
 -}
 +});
+}
+}