Title: [185781] trunk/Source/WebCore
- Revision
- 185781
- Author
- [email protected]
- Date
- 2015-06-19 16:51:49 -0700 (Fri, 19 Jun 2015)
Log 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 <[email protected]> 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (185780 => 185781)
--- trunk/Source/WebCore/ChangeLog 2015-06-19 23:49:38 UTC (rev 185780)
+++ trunk/Source/WebCore/ChangeLog 2015-06-19 23:51:49 UTC (rev 185781)
@@ -1,3 +1,18 @@
+2015-06-19 Joseph Pecoraro <[email protected]>
+
+ 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 <[email protected]>
Extremely large canvas crashes on pre-El Capitan machines
Modified: trunk/Source/WebCore/page/PageConsoleClient.cpp (185780 => 185781)
--- trunk/Source/WebCore/page/PageConsoleClient.cpp 2015-06-19 23:49:38 UTC (rev 185780)
+++ trunk/Source/WebCore/page/PageConsoleClient.cpp 2015-06-19 23:51:49 UTC (rev 185781)
@@ -93,6 +93,8 @@
return;
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.
if (!parser->shouldAssociateConsoleMessagesWithTextPosition())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
