Changeset 158940 in webkit

Timestamp:

Nov 8, 2013 12:27:55 PM (10 years ago)

Author:

oliver@apple.com

Message:

Fix minor (unobservable) bug in ArrayIterator::next()
​https://bugs.webkit.org/show_bug.cgi?id=124061

Reviewed by Beth Dakin.

I noticed this while reading the array iterator code. Due to how
ArrayIterator::next() and our enumeration behaviour is implemented
this is not actually a code path that can be hit. But in order to
future proof this it should be correct.

• runtime/JSArrayIterator.cpp:

(JSC::arrayIteratorNext):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/JSArrayIterator.cpp (modified) (1 diff)
• runtime/JSSetIterator.cpp (added)
• runtime/JSSetIterator.h (added)
• runtime/SetIteratorConstructor.cpp (added)
• runtime/SetIteratorConstructor.h (added)
• runtime/SetIteratorPrototype.cpp (added)
• runtime/SetIteratorPrototype.h (added)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-11-08  Oliver Hunt  <oliver@apple.com>
+
+        Fix minor (unobservable) bug in ArrayIterator::next()
+        https://bugs.webkit.org/show_bug.cgi?id=124061
+
+        Reviewed by Beth Dakin.
+
+        I noticed this while reading the array iterator code.  Due to how
+        ArrayIterator::next() and our enumeration behaviour is implemented
+        this is not actually a code path that can be hit.  But in order to
+        future proof this it should be correct.
+        
+        * runtime/JSArrayIterator.cpp:
+        (JSC::arrayIteratorNext):
+
 2013-11-08  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/runtime/JSArrayIterator.cpp

@@ -101 +101 @@
 {
     JSArrayIterator* iterator = jsDynamicCast<JSArrayIterator*>(callFrame->thisValue());
-    if (!iterator)
-        throwTypeError(callFrame, ASCIILiteral("Cannot call ArrayIterator.next() on a non-ArrayIterator object"));
+    if (!iterator) {
+        ASSERT_NOT_REACHED();
+        return JSValue::encode(throwTypeError(callFrame, ASCIILiteral("Cannot call ArrayIterator.next() on a non-ArrayIterator object")));
+    }
     JSObject* iteratedObject = iterator->iteratedObject();
     size_t index = iterator->nextIndex();