Changeset 185712 in webkit

Timestamp:

Jun 18, 2015, 11:16:55 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Crash under WebCore::DOMWindow::dispatchMessageEventWithOriginCheck attempting to log console message
​https://bugs.webkit.org/show_bug.cgi?id=146093

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2015-06-18
Reviewed by Timothy Hatcher.

• page/DOMWindow.cpp:

(WebCore::DOMWindow::dispatchMessageEventWithOriginCheck):
The console could be null so null check its use.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/DOMWindow.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-18  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Crash under WebCore::DOMWindow::dispatchMessageEventWithOriginCheck attempting to log console message
+        https://bugs.webkit.org/show_bug.cgi?id=146093
+
+        Reviewed by Timothy Hatcher.
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::dispatchMessageEventWithOriginCheck):
+        The console could be null so null check its use.
+
 2015-06-18  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -935 +935 @@
         // Check target origin now since the target document may have changed since the timer was scheduled.
         if (!intendedTargetOrigin->isSameSchemeHostPort(document()->securityOrigin())) {
-            String message = "Unable to post message to " + intendedTargetOrigin->toString() +
-                             ". Recipient has origin " + document()->securityOrigin()->toString() + ".\n";
-            console()->addMessage(MessageSource::Security, MessageLevel::Error, message, stackTrace);
+            if (PageConsoleClient* pageConsole = console()) {
+                String message = makeString("Unable to post message to ", intendedTargetOrigin->toString(), ". Recipient has origin ", document()->securityOrigin()->toString(), ".\n");
+                pageConsole->addMessage(MessageSource::Security, MessageLevel::Error, message, stackTrace);
+            }
             return;
         }