IE8: Don't infinite-loop in HasProperty check

inexorabletash · Mar 2, 2018 · beafb24 · beafb24
1 parent 1b5c327
commit beafb24
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/es6.js b/es6.js
@@ -502,7 +502,9 @@
     while (o) {
       if (Object.prototype.hasOwnProperty.call(o, p)) return true;
       if (Type(o) !== 'object') return false;
-      o = Object.getPrototypeOf(o);
+      var op = Object.getPrototypeOf(o);
+      if (op === o) return false; // IE8 has self-referential prototypes
+      o = op;
     }
     return false;
   }

diff --git a/experimental/es-proposed.js b/experimental/es-proposed.js
@@ -119,7 +119,9 @@
     while (o) {
       if (Object.prototype.hasOwnProperty.call(o, p)) return true;
       if (Type(o) !== 'object') return false;
-      o = Object.getPrototypeOf(o);
+      var op = Object.getPrototypeOf(o);
+      if (op === o) return false; // IE8 has self-referential prototypes
+      o = op;
     }
     return false;
   }

diff --git a/polyfill.js b/polyfill.js
@@ -990,7 +990,9 @@ if (!Date.prototype.toISOString) {
     while (o) {
       if (Object.prototype.hasOwnProperty.call(o, p)) return true;
       if (Type(o) !== 'object') return false;
-      o = Object.getPrototypeOf(o);
+      var op = Object.getPrototypeOf(o);
+      if (op === o) return false; // IE8 has self-referential prototypes
+      o = op;
     }
     return false;
   }
@@ -1069,8 +1071,6 @@ if (!Date.prototype.toISOString) {
 
   // 7.4.8 CreateListIterator (list)
   // 7.4.8.1 ListIterator next( )
-  // 7.4.9 CreateCompoundIterator ( iterator1, iterator2 )
-  // 7.4.9.1 CompoundIterator next( )
 
   //----------------------------------------
   // 8 Executable Code and Execution Contexts

diff --git a/polyfill.min.js b/polyfill.min.js