Changeset 76373 in webkit

Timestamp:

Jan 21, 2011 11:40:02 AM (13 years ago)

Author:

antonm@chromium.org

Message:

2011-01-21 Anton Muhin <​antonm@chromium.org>

Reviewed by Nate Chapin.

[v8] Properly deal with the case when conversion to string throws an exception for HTMLCollection accessors
​https://bugs.webkit.org/show_bug.cgi?id=52901

• fast/dom/htmlcollection-conversion-throws-exception-expected.txt: Added.
• fast/dom/htmlcollection-conversion-throws-exception.html: Added.

2011-01-21 Anton Muhin <​antonm@chromium.org>

Reviewed by Nate Chapin.

[v8] Properly deal with the case when conversion to string throws an exception for HTMLCollection accessors
​https://bugs.webkit.org/show_bug.cgi?id=52901

Test: fast/dom/htmlcollection-conversion-throws-exception.html

• bindings/v8/custom/V8HTMLCollectionCustom.cpp: (WebCore::getItem):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/htmlcollection-conversion-throws-exception-expected.txt (added)
• LayoutTests/fast/dom/htmlcollection-conversion-throws-exception.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/v8/custom/V8HTMLCollectionCustom.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-21  Anton Muhin  <antonm@chromium.org>
+
+        Reviewed by Nate Chapin.
+
+        [v8] Properly deal with the case when conversion to string throws an exception for HTMLCollection accessors
+        https://bugs.webkit.org/show_bug.cgi?id=52901
+
+        * fast/dom/htmlcollection-conversion-throws-exception-expected.txt: Added.
+        * fast/dom/htmlcollection-conversion-throws-exception.html: Added.
+
 2011-01-21  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-21  Anton Muhin  <antonm@chromium.org>
+
+        Reviewed by Nate Chapin.
+
+        [v8] Properly deal with the case when conversion to string throws an exception for HTMLCollection accessors
+        https://bugs.webkit.org/show_bug.cgi?id=52901
+
+        Test: fast/dom/htmlcollection-conversion-throws-exception.html
+
+        * bindings/v8/custom/V8HTMLCollectionCustom.cpp:
+        (WebCore::getItem):
+
 2011-01-21  Adam Roben  <aroben@apple.com>
 

trunk/Source/WebCore/bindings/v8/custom/V8HTMLCollectionCustom.cpp

@@ -60 +60 @@
     v8::Local<v8::Uint32> index = argument->ToArrayIndex();
     if (index.IsEmpty()) {
-        v8::Handle<v8::Value> result = getNamedItems(collection, toWebCoreString(argument->ToString()));
+        v8::Local<v8::String> asString = argument->ToString();
+        if (asString.IsEmpty())
+            return v8::Handle<v8::Value>();
+        v8::Handle<v8::Value> result = getNamedItems(collection, toWebCoreString(asString));
 
         if (result.IsEmpty())