Changeset 34302 in webkit for trunk/JavaScriptCore/kjs/array_instance.cpp

Timestamp:

Jun 2, 2008, 9:30:10 AM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-06-02 Geoffrey Garen <​[email protected]>

Reviewed by Darin Adler.

Fixed ASSERT due to execution continuing after an exception is thrown
during array sort.

• kjs/array_instance.cpp: (KJS::AVLTreeAbstractorForArrayCompare::compare_key_key): Don't call the custom comparator function if an exception has been thrown. Just return 1 for everything, so the sort completes quickly. (The result will be thrown away.)

LayoutTests:

2008-06-02 Geoffrey Garen <​[email protected]>

Reviewed by Darin Adler.

Test for an exception thrown from an array sort comparator function.

• fast/js/throw-from-array-sort-expected.txt: Added.
• fast/js/throw-from-array-sort.html: Added.

File:

• trunk/JavaScriptCore/kjs/array_instance.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/array_instance.cpp

@@ -541 +541 @@
         ASSERT(!vb->isUndefined());
 
+        if (m_exec->hadException())
+            return 1;
+
         List arguments;
         arguments.append(va);