fixup! lib: use null-prototype objects for property descriptors

nodejs · nodejs-github-bot · Jun 3, 2022 · May 25, 2022 · Jun 1, 2022 · Jun 1, 2022
commit 5d0986a405761121eebf4f8573bbcce87d4e4920
diff --git a/lib/internal/console/global.js b/lib/internal/console/global.js
@@ -37,7 +37,7 @@ for (const prop of ReflectOwnKeys(Console.prototype)) {
   if (typeof desc.value === 'function') { // fix the receiver
     const name = desc.value.name;
     desc.value = FunctionPrototypeBind(desc.value, globalConsole);
-    ReflectDefineProperty(desc.value, 'name', { value: name });
+    ReflectDefineProperty(desc.value, 'name', { __proto__: null, value: name });
   }
   ReflectDefineProperty(globalConsole, prop, desc);
 }

diff --git a/lib/internal/encoding.js b/lib/internal/encoding.js
@@ -4,8 +4,11 @@
 // https://encoding.spec.whatwg.org
 
 const {
+  ArrayPrototypeMap,
   ObjectCreate,
   ObjectDefineProperties,
+  ObjectEntries,
+  ObjectFromEntries,
   ObjectGetOwnPropertyDescriptors,
   SafeMap,
   StringPrototypeSlice,
@@ -532,7 +535,7 @@ function makeTextDecoderJS() {
 // Mix in some shared properties.
 ObjectDefineProperties(
   TextDecoder.prototype,
-  ObjectGetOwnPropertyDescriptors({
+  ObjectFromEntries(ArrayPrototypeMap(ObjectEntries(ObjectGetOwnPropertyDescriptors({
     get encoding() {
       validateDecoder(this);
       return this[kEncoding];
@@ -566,7 +569,7 @@ ObjectDefineProperties(
       const { inspect } = require('internal/util/inspect');
       return `${constructor.name} ${inspect(obj)}`;
     }
-  })
+  })), ({ 0: key, 1: desc }) => [key, { __proto__: null, ...desc }]))
 );
 
 ObjectDefineProperties(TextDecoder.prototype, {

diff --git a/lib/internal/per_context/primordials.js b/lib/internal/per_context/primordials.js
@@ -57,11 +57,13 @@ function getNewKey(key) {
 
 function copyAccessor(dest, prefix, key, { enumerable, get, set }) {
   ReflectDefineProperty(dest, `${prefix}Get${key}`, {
+    __proto__: null,
     value: uncurryThis(get),
     enumerable
   });
   if (set !== undefined) {
     ReflectDefineProperty(dest, `${prefix}Set${key}`, {
+      __proto__: null,
       value: uncurryThis(set),
       enumerable
     });
@@ -79,6 +81,7 @@ function copyPropsRenamed(src, dest, prefix) {
       ReflectDefineProperty(dest, name, desc);
       if (varargsMethods.includes(name)) {
         ReflectDefineProperty(dest, `${name}Apply`, {
+          __proto__: null,
           // `src` is bound as the `this` so that the static `this` points
           // to the object it was defined on,
           // e.g.: `ArrayOfApply` gets a `this` of `Array`:
@@ -105,6 +108,7 @@ function copyPropsRenamedBound(src, dest, prefix) {
       ReflectDefineProperty(dest, name, desc);
       if (varargsMethods.includes(name)) {
         ReflectDefineProperty(dest, `${name}Apply`, {
+          __proto__: null,
           value: applyBind(value, src),
         });
       }
@@ -128,6 +132,7 @@ function copyPrototype(src, dest, prefix) {
       ReflectDefineProperty(dest, name, desc);
       if (varargsMethods.includes(name)) {
         ReflectDefineProperty(dest, `${name}Apply`, {
+          __proto__: null,
           value: applyBind(value),
         });
       }

diff --git a/lib/internal/worker/js_transferable.js b/lib/internal/worker/js_transferable.js
@@ -1,7 +1,10 @@
 'use strict';
 const {
+  ArrayPrototypeMap,
   Error,
   ObjectDefineProperties,
+  ObjectEntries,
+  ObjectFromEntries,
   ObjectGetOwnPropertyDescriptors,
   ObjectGetPrototypeOf,
   ObjectSetPrototypeOf,
@@ -40,7 +43,11 @@ function setup() {
 
 function makeTransferable(obj) {
   const inst = ReflectConstruct(JSTransferable, [], obj.constructor);
-  ObjectDefineProperties(inst, ObjectGetOwnPropertyDescriptors(obj));
+  ObjectDefineProperties(inst,
+                         ObjectFromEntries(ArrayPrototypeMap(
+                           ObjectEntries(ObjectGetOwnPropertyDescriptors(obj)),
+                           ({ 0: key, 1: desc }) => [key, { __proto__: null, ...desc }]
+                         )));
   ObjectSetPrototypeOf(inst, ObjectGetPrototypeOf(obj));
   return inst;
 }