1 files changed, 53 insertions, 0 deletions
diff --git a/js/src/tests/test262/built-ins/Object/fromEntries/iterator-not-closed-for-next-returning-non-object.js b/js/src/tests/test262/built-ins/Object/fromEntries/iterator-not-closed-for-next-returning-non-object.js
new file mode 100644
index 0000000000..e4d37f5190
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Object/fromEntries/iterator-not-closed-for-next-returning-non-object.js
@@ -0,0 +1,53 @@
+// Copyright (C) 2018 Kevin Gibbons. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-object.fromentries
+description: Does not close iterators with a `next` method which returns a non-object.
+info: |
+  Object.fromEntries ( iterable )
+
+  ...
+  4. Let stepsDefine be the algorithm steps defined in CreateDataPropertyOnObject Functions.
+  5. Let adder be CreateBuiltinFunction(stepsDefine, « »).
+  6. Return ? AddEntriesFromIterable(obj, iterable, adder).
+
+  AddEntriesFromIterable ( target, iterable, adder )
+
+  ...
+  4. Repeat,
+    a. Let next be ? IteratorStep(iteratorRecord).
+
+
+  IteratorStep ( iteratorRecord )
+
+  1. Let result be ? IteratorNext(iteratorRecord).
+
+
+  IteratorNext ( iteratorRecord [ , value ] )
+
+  ...
+  3. If Type(result) is not Object, throw a TypeError exception.
+
+features: [Symbol.iterator, Object.fromEntries]
+---*/
+
+var iterable = {
+  [Symbol.iterator]: function() {
+    return {
+      next: function() {
+        return null;
+      },
+      return: function() {
+        throw new Test262Error('should not call return');
+      },
+    };
+  },
+};
+
+assert.sameValue(typeof Object.fromEntries, 'function');
+assert.throws(TypeError, function() {
+  Object.fromEntries(iterable);
+});
+
+reportCompare(0, 0);