Changeset 267125 in webkit

Timestamp:

Sep 15, 2020 6:17:07 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Check whether the iterator is callable in spread
​https://bugs.webkit.org/show_bug.cgi?id=215974

Patch by HyeockJin Kim <​kherootz@gmail.com> on 2020-09-15
Reviewed by Darin Adler.

JSTests:

• stress/spread-array-iterator.js: Added.

(shouldThrowTypeError):
(shouldThrowExactly):
(f):
(C):

Source/JavaScriptCore:

• builtins/IteratorHelpers.js:

(performIteration):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/spread-array-iterator.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/builtins/IteratorHelpers.js (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2020-09-15  HyeockJin Kim  <kherootz@gmail.com>
+
+        Check whether the iterator is callable in spread
+        https://bugs.webkit.org/show_bug.cgi?id=215974
+
+        Reviewed by Darin Adler.
+
+        * stress/spread-array-iterator.js: Added.
+        (shouldThrowTypeError):
+        (shouldThrowExactly):
+        (f):
+        (C):
+
 2020-09-15  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-09-15  HyeockJin Kim  <kherootz@gmail.com>
+
+        Check whether the iterator is callable in spread
+        https://bugs.webkit.org/show_bug.cgi?id=215974
+
+        Reviewed by Darin Adler.
+
+        * builtins/IteratorHelpers.js:
+        (performIteration):
+
 2020-09-15  Tadeu Zagallo  <tzagallo@apple.com>
 

trunk/Source/JavaScriptCore/builtins/IteratorHelpers.js

@@ -32 +32 @@
 
     var result = [];
+    if (@isUndefinedOrNull(iterable))
+        @throwTypeError('Spread syntax requires ...iterable not be null or undefined');
+    
+    var iteratorMethod = iterable.@@iterator;
+    if (!@isCallable(iteratorMethod))
+        @throwTypeError('Spread syntax requires ...iterable[Symbol.iterator] to be a function');
 
-    var iterator = iterable.@@iterator();
+    var iterator = iteratorMethod.@call(iterable);
     var next = iterator.next;
     var item;