Title: [186423] releases/WebKitGTK/webkit-2.8/Source/WebCore
- Revision
- 186423
- Author
- [email protected]
- Date
- 2015-07-07 02:05:25 -0700 (Tue, 07 Jul 2015)
Log Message
Merge r185781 - 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: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (186422 => 186423)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-07 09:03:55 UTC (rev 186422)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-07-07 09:05:25 UTC (rev 186423)
@@ -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 Andy Estes <[email protected]>
Various assertion failures occur when executing script in the midst of DOM insertion
Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/page/PageConsoleClient.cpp (186422 => 186423)
--- releases/WebKitGTK/webkit-2.8/Source/WebCore/page/PageConsoleClient.cpp 2015-07-07 09:03:55 UTC (rev 186422)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/page/PageConsoleClient.cpp 2015-07-07 09:05:25 UTC (rev 186423)
@@ -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
