From 75c9377766326589faa844a95d5997a156f6aed0 Mon Sep 17 00:00:00 2001
From: janekptacijarabaci <janekptacijarabaci@seznam.cz>
Date: Thu, 15 Mar 2018 21:11:35 +0100
Subject: Close iterator after error in {Map,Set,WeakMap,WeakSet} constructors

Issue #17
---
 js/src/builtin/Map.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'js/src/builtin/Map.js')

diff --git a/js/src/builtin/Map.js b/js/src/builtin/Map.js
index 432364614..27a12bfff 100644
--- a/js/src/builtin/Map.js
+++ b/js/src/builtin/Map.js
@@ -40,11 +40,18 @@ function MapConstructorInit(iterable) {
         var nextItem = next.value;
 
         // Step 8.d.
-        if (!IsObject(nextItem))
+        if (!IsObject(nextItem)) {
+            IteratorCloseThrow(iter);
             ThrowTypeError(JSMSG_INVALID_MAP_ITERABLE, "Map");
+        }
 
         // Steps 8.e-j.
-        callContentFunction(adder, map, nextItem[0], nextItem[1]);
+        try {
+            callContentFunction(adder, map, nextItem[0], nextItem[1]);
+        } catch (e) {
+            IteratorCloseThrow(iter);
+            throw e;
+        }
     }
 }
 
-- 
cgit v1.2.3