Changeset 166551 in webkit

Timestamp:

Mar 31, 2014 5:19:14 PM (10 years ago)

Author:

ap@apple.com

Message:

Crashes in PageConsole::addMessage
​https://bugs.webkit.org/show_bug.cgi?id=130991
<rdar://problem/14795232>

Reviewed by Geoffrey Garen.

Source/WebCore:

Test: http/tests/misc/detached-frame-console.html

• page/DOMWindow.cpp: (WebCore::DOMWindow::printErrorMessage): Added a null check.

It's legitimate for this to be called for a window that is not currently displayed
in a frame.

LayoutTests:

• http/tests/misc/detached-frame-console-expected.txt: Added.
• http/tests/misc/detached-frame-console.html: Added.
• http/tests/misc/resources/detached-frame-console-subframe.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/misc/detached-frame-console-expected.txt (added)
• LayoutTests/http/tests/misc/detached-frame-console.html (added)
• LayoutTests/http/tests/misc/resources/detached-frame-console-subframe.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/DOMWindow.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-03-31  Alexey Proskuryakov  <ap@apple.com>
+
+        Crashes in PageConsole::addMessage
+        https://bugs.webkit.org/show_bug.cgi?id=130991
+        <rdar://problem/14795232>
+
+        Reviewed by Geoffrey Garen.
+
+        * http/tests/misc/detached-frame-console-expected.txt: Added.
+        * http/tests/misc/detached-frame-console.html: Added.
+        * http/tests/misc/resources/detached-frame-console-subframe.html: Added.
+
 2014-03-31  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-31  Alexey Proskuryakov  <ap@apple.com>
+
+        Crashes in PageConsole::addMessage
+        https://bugs.webkit.org/show_bug.cgi?id=130991
+        <rdar://problem/14795232>
+
+        Reviewed by Geoffrey Garen.
+
+        Test: http/tests/misc/detached-frame-console.html
+
+        * page/DOMWindow.cpp: (WebCore::DOMWindow::printErrorMessage): Added a null check.
+        It's legitimate for this to be called for a window that is not currently displayed
+        in a frame.
+
 2014-03-31  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -1940 +1940 @@
         return;
 
-    pageConsole()->addMessage(MessageSource::JS, MessageLevel::Error, message);
+    if (PageConsole* console = pageConsole())
+        console->addMessage(MessageSource::JS, MessageLevel::Error, message);
 }