Merge pull request #155 from rbuckton/fix-153

Fix stack overflow crash in isProviderFor
rbuckton · Dec 14, 2023 · 7afd45d · 7afd45d
2 parents 1fce5c6 + af40361
commit 7afd45d
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 18 deletions.
diff --git a/Reflect.ts b/Reflect.ts
@@ -1745,14 +1745,15 @@ namespace Reflect {
         }
 
         function CreateFallbackProvider(reflect: typeof Reflect): MetadataProvider {
+            const { defineMetadata, hasOwnMetadata, getOwnMetadata, getOwnMetadataKeys, deleteMetadata } = reflect;
             const metadataOwner = new _WeakMap<object, Set<string | symbol | undefined>>();
             const provider: MetadataProvider = {
                 isProviderFor(O, P) {
                     let metadataPropertySet = metadataOwner.get(O);
                     if (!IsUndefined(metadataPropertySet)) {
                         return metadataPropertySet.has(P);
                     }
-                    if (reflect.getOwnMetadataKeys(O, P!).length) {
+                    if (getOwnMetadataKeys(O, P!).length) {
                         if (IsUndefined(metadataPropertySet)) {
                             metadataPropertySet = new _Set();
                             metadataOwner.set(O, metadataPropertySet);
@@ -1762,11 +1763,11 @@ namespace Reflect {
                     }
                     return false;
                 },
-                OrdinaryDefineOwnMetadata: reflect.defineMetadata,
-                OrdinaryHasOwnMetadata: reflect.hasOwnMetadata,
-                OrdinaryGetOwnMetadata: reflect.getOwnMetadata,
-                OrdinaryOwnMetadataKeys: reflect.getOwnMetadataKeys,
-                OrdinaryDeleteMetadata: reflect.deleteMetadata,
+                OrdinaryDefineOwnMetadata: defineMetadata,
+                OrdinaryHasOwnMetadata: hasOwnMetadata,
+                OrdinaryGetOwnMetadata: getOwnMetadata,
+                OrdinaryOwnMetadataKeys: getOwnMetadataKeys,
+                OrdinaryDeleteMetadata: deleteMetadata,
             };
             return provider;
         }

diff --git a/ReflectLite.ts b/ReflectLite.ts
@@ -1705,14 +1705,15 @@ namespace Reflect {
         }
 
         function CreateFallbackProvider(reflect: typeof Reflect): MetadataProvider {
+            const { defineMetadata, hasOwnMetadata, getOwnMetadata, getOwnMetadataKeys, deleteMetadata } = reflect;
             const metadataOwner = new _WeakMap<object, Set<string | symbol | undefined>>();
             const provider: MetadataProvider = {
                 isProviderFor(O, P) {
                     let metadataPropertySet = metadataOwner.get(O);
                     if (!IsUndefined(metadataPropertySet)) {
                         return metadataPropertySet.has(P);
                     }
-                    if (reflect.getOwnMetadataKeys(O, P!).length) {
+                    if (getOwnMetadataKeys(O, P!).length) {
                         if (IsUndefined(metadataPropertySet)) {
                             metadataPropertySet = new _Set();
                             metadataOwner.set(O, metadataPropertySet);
@@ -1722,11 +1723,11 @@ namespace Reflect {
                     }
                     return false;
                 },
-                OrdinaryDefineOwnMetadata: reflect.defineMetadata,
-                OrdinaryHasOwnMetadata: reflect.hasOwnMetadata,
-                OrdinaryGetOwnMetadata: reflect.getOwnMetadata,
-                OrdinaryOwnMetadataKeys: reflect.getOwnMetadataKeys,
-                OrdinaryDeleteMetadata: reflect.deleteMetadata,
+                OrdinaryDefineOwnMetadata: defineMetadata,
+                OrdinaryHasOwnMetadata: hasOwnMetadata,
+                OrdinaryGetOwnMetadata: getOwnMetadata,
+                OrdinaryOwnMetadataKeys: getOwnMetadataKeys,
+                OrdinaryDeleteMetadata: deleteMetadata,
             };
             return provider;
         }

diff --git a/ReflectNoConflict.ts b/ReflectNoConflict.ts
@@ -1582,14 +1582,15 @@ function CreateMetadataProvider(registry: MetadataRegistry): MetadataProvider {
 }
 
 function CreateFallbackProvider(reflect: typeof Reflect): MetadataProvider {
+    const { defineMetadata, hasOwnMetadata, getOwnMetadata, getOwnMetadataKeys, deleteMetadata } = reflect;
     const metadataOwner = new _WeakMap<object, Set<string | symbol | undefined>>();
     const provider: MetadataProvider = {
         isProviderFor(O, P) {
             let metadataPropertySet = metadataOwner.get(O);
             if (!IsUndefined(metadataPropertySet)) {
                 return metadataPropertySet.has(P);
             }
-            if (reflect.getOwnMetadataKeys(O, P!).length) {
+            if (getOwnMetadataKeys(O, P!).length) {
                 if (IsUndefined(metadataPropertySet)) {
                     metadataPropertySet = new _Set();
                     metadataOwner.set(O, metadataPropertySet);
@@ -1599,11 +1600,11 @@ function CreateFallbackProvider(reflect: typeof Reflect): MetadataProvider {
             }
             return false;
         },
-        OrdinaryDefineOwnMetadata: reflect.defineMetadata,
-        OrdinaryHasOwnMetadata: reflect.hasOwnMetadata,
-        OrdinaryGetOwnMetadata: reflect.getOwnMetadata,
-        OrdinaryOwnMetadataKeys: reflect.getOwnMetadataKeys,
-        OrdinaryDeleteMetadata: reflect.deleteMetadata,
+        OrdinaryDefineOwnMetadata: defineMetadata,
+        OrdinaryHasOwnMetadata: hasOwnMetadata,
+        OrdinaryGetOwnMetadata: getOwnMetadata,
+        OrdinaryOwnMetadataKeys: getOwnMetadataKeys,
+        OrdinaryDeleteMetadata: deleteMetadata,
     };
     return provider;
 }

diff --git a/test/reflect-other.ts b/test/reflect-other.ts
@@ -25,5 +25,17 @@ for (const { name, header, context } of suites.filter(s => s.global)) {
                 assert.strictEqual(Reflect.getOwnMetadata("key", obj), "value");
             });
         });
+
+        it("isProviderFor crash", () => {
+            const { Reflect } = script(context)`
+                Reflect.defineMetadata = function() {};
+                Reflect.getOwnMetadataKeys = function() { return [] };
+                Reflect.getMetadataKeys = function() { return []; }
+                ${header}
+                exports.Reflect = Reflect;
+            `;
+            let obj = {};
+            Reflect.getMetadataKeys(obj);
+        });
     });
 }