Changeset 85054 in webkit

Timestamp:

Apr 27, 2011 9:00:17 AM (13 years ago)

Author:

yurys@chromium.org

Message:

2011-04-27 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: browser crash on evaluation of 'throw undefined'
​https://bugs.webkit.org/show_bug.cgi?id=59611

• inspector/console/console-eval-throw-undefined-expected.txt: Added.
• inspector/console/console-eval-throw-undefined.html: Added.

2011-04-27 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: browser crash on evaluation of 'throw undefined'
​https://bugs.webkit.org/show_bug.cgi?id=59611

Test: inspector/console/console-eval-throw-undefined.html

• inspector/InjectedScriptSource.js: use try/catch to protect from exception during conversion of another exception to string.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/console/console-eval-throw-undefined-expected.txt (added)
• LayoutTests/inspector/console/console-eval-throw-undefined.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/InjectedScriptSource.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-27  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: browser crash on evaluation of 'throw undefined'
+        https://bugs.webkit.org/show_bug.cgi?id=59611
+
+        * inspector/console/console-eval-throw-undefined-expected.txt: Added.
+        * inspector/console/console-eval-throw-undefined.html: Added.
+
 2011-04-27  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-27  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: browser crash on evaluation of 'throw undefined'
+        https://bugs.webkit.org/show_bug.cgi?id=59611
+
+        Test: inspector/console/console-eval-throw-undefined.html
+
+        * inspector/InjectedScriptSource.js: use try/catch to protect from
+        exception during conversion of another exception to string.
+
 2011-04-27  Pavel Feldman  <pfeldman@google.com>
 

trunk/Source/WebCore/inspector/InjectedScriptSource.js

@@ -453 +453 @@
 InjectedScript.RemoteObject.fromException = function(e)
 {
-    return new InjectedScript.RemoteObject(null, "error", e.toString());
+    try {
+        var description = injectedScript._describe(e);
+    } catch (ex) {
+        var description = "<failed to convert exception to string>";
+    }
+    return new InjectedScript.RemoteObject(null, "error", description);
 }