Changeset 185781 in webkit

Timestamp:

Jun 19, 2015, 4:51:49 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Crash under WebCore::PageConsoleClient::addMessage attempting to log insecure content message in ImageDocument
​https://bugs.webkit.org/show_bug.cgi?id=146096

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

Was able to reproduce this using a user stylesheet with an http css font
on a pdf (ImageDocument) main document loaded over https. Was unable to
create a reliable test for this scenario.

• page/PageConsoleClient.cpp:

(WebCore::getParserLocationForConsoleMessage):
The scriptableDocumentParser could be null, such as in an ImageDocument.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-19  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Crash under WebCore::PageConsoleClient::addMessage attempting to log insecure content message in ImageDocument
+        https://bugs.webkit.org/show_bug.cgi?id=146096
+
+        Reviewed by Timothy Hatcher.
+
+        Was able to reproduce this using a user stylesheet with an http css font
+        on a pdf (ImageDocument) main document loaded over https. Was unable to
+        create a reliable test for this scenario.
+
+        * page/PageConsoleClient.cpp:
+        (WebCore::getParserLocationForConsoleMessage):
+        The scriptableDocumentParser could be null, such as in an ImageDocument.
+
 2015-06-19  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/page/PageConsoleClient.cpp

@@ -94 +94 @@
 
     ScriptableDocumentParser* parser = document->scriptableDocumentParser();
+    if (!parser)
+        return;
 
     // When the parser waits for scripts, any messages must be coming from some other source, and are not related to the location of the script element that made the parser wait.