fix: An issue where objects with a custom "hasOwnProperty" could fail to be serialized

Author: KallynGowdy

deno/StructureClone.ts

@@ -230,7 +230,7 @@ function _serializeObject(value: unknown, map: Map<any, MapRef>) {
             obj: ref,
         });
         for (let prop in value) {
-            if (value.hasOwnProperty(prop)) {
+            if (Object.hasOwnProperty.call(value, prop)) {
                 root[prop] = _serializeObject((<any>value)[prop], map);
             }
         }
@@ -395,7 +395,7 @@ function _deserializeRef(
         let obj = {} as any;
         map.set(ref, obj);
         for (let prop in refData.root) {
-            if (refData.root.hasOwnProperty(prop)) {
+            if (Object.hasOwnProperty.call(refData.root, prop)) {
                 const value = refData.root[prop];
                 obj[prop] = Array.isArray(value)
                     ? _deserializeRef(structure, value[0], map, transfered)

deno/StructureClone_test.ts

@@ -342,6 +342,22 @@ Deno.test('serializeStructure() should support MessagePort objects', () => {
     });
 });
 
+Deno.test(
+    'serializeStructure() should not error when given an object without hasOwnProperty',
+    () => {
+        let obj = {
+            myProp: 'abc',
+            hasOwnProperty: null,
+        };
+        assertEquals(serializeStructure(obj), {
+            root: {
+                hasOwnProperty: null,
+                myProp: 'abc',
+            },
+        });
+    }
+);
+
 Deno.test(
     'deserializeStructure() should return the root value for primitives',
     () => {
@@ -715,3 +731,27 @@ Deno.test(
         assert(deserialized.data !== deserialized.transferred[0]);
     }
 );
+
+Deno.test(
+    'deserializeStructure() should not error when given an object without hasOwnProperty',
+    () => {
+        const deserialized = deserializeStructure({
+            root: ['$0'],
+            refs: {
+                $0: {
+                    root: {
+                        hasOwnProperty: null,
+                        myProp: 'abc',
+                    },
+                },
+            },
+        });
+        assertEquals(deserialized, {
+            data: {
+                hasOwnProperty: null,
+                myProp: 'abc',
+            },
+            transferred: [],
+        });
+    }
+);

src/StructureClone.spec.ts

@@ -333,6 +333,19 @@ describe('StructureClone', () => {
                 },
             });
         });
+
+        it('should not error when given an object without hasOwnProperty', () => {
+            let obj = {
+                myProp: 'abc',
+                hasOwnProperty: null as any,
+            };
+            expect(serializeStructure(obj)).toEqual({
+                root: {
+                    hasOwnProperty: null,
+                    myProp: 'abc',
+                },
+            });
+        });
     });
 
     describe('deserializeStructure', () => {
@@ -660,5 +673,27 @@ describe('StructureClone', () => {
 
             expect(deserialized.data).not.toBe(deserialized.transferred[0]);
         });
+
+        it('should not error when given an object without hasOwnProperty', () => {
+            const deserialized = deserializeStructure({
+                root: ['$0'],
+                refs: {
+                    $0: {
+                        root: {
+                            hasOwnProperty: null,
+                            myProp: 'abc',
+                        },
+                    },
+                },
+            });
+
+            expect(deserialized).toEqual({
+                data: {
+                    hasOwnProperty: null,
+                    myProp: 'abc',
+                },
+                transferred: [],
+            });
+        });
     });
 });

src/StructureClone.ts

@@ -228,7 +228,7 @@ function _serializeObject(value: unknown, map: Map<any, MapRef>) {
             obj: ref,
         });
         for (let prop in value) {
-            if (value.hasOwnProperty(prop)) {
+            if (Object.hasOwnProperty.call(value, prop)) {
                 root[prop] = _serializeObject((<any>value)[prop], map);
             }
         }
@@ -390,7 +390,7 @@ function _deserializeRef(
         let obj = {} as any;
         map.set(ref, obj);
         for (let prop in refData.root) {
-            if (refData.root.hasOwnProperty(prop)) {
+            if (Object.hasOwnProperty.call(refData.root, prop)) {
                 const value = refData.root[prop];
                 obj[prop] = Array.isArray(value)
                     ? _deserializeRef(structure, value[0], map, transfered)