Title: [184089] releases/WebKitGTK/webkit-2.8/Source/WebKit2
- Revision
- 184089
- Author
- [email protected]
- Date
- 2015-05-11 06:10:17 -0700 (Mon, 11 May 2015)
Log Message
Merge r182979 - Possible null pointer dereference in WebDiagnosticLoggingClient::logDiagnosticMessageWithValue()
https://bugs.webkit.org/show_bug.cgi?id=143899
<rdar://problem/20584215>
Reviewed by Anders Carlsson.
WebDiagnosticLoggingClient::logDiagnosticMessage*() methods failed to
check that m_page.corePage() was non-null before dereferencing, thus
causing crashes when it is null.
* WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp:
(WebKit::WebDiagnosticLoggingClient::logDiagnosticMessage):
(WebKit::WebDiagnosticLoggingClient::logDiagnosticMessageWithResult):
(WebKit::WebDiagnosticLoggingClient::logDiagnosticMessageWithValue):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog (184088 => 184089)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-05-11 13:08:11 UTC (rev 184088)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-05-11 13:10:17 UTC (rev 184089)
@@ -1,3 +1,20 @@
+2015-04-17 Chris Dumez <[email protected]>
+
+ Possible null pointer dereference in WebDiagnosticLoggingClient::logDiagnosticMessageWithValue()
+ https://bugs.webkit.org/show_bug.cgi?id=143899
+ <rdar://problem/20584215>
+
+ Reviewed by Anders Carlsson.
+
+ WebDiagnosticLoggingClient::logDiagnosticMessage*() methods failed to
+ check that m_page.corePage() was non-null before dereferencing, thus
+ causing crashes when it is null.
+
+ * WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp:
+ (WebKit::WebDiagnosticLoggingClient::logDiagnosticMessage):
+ (WebKit::WebDiagnosticLoggingClient::logDiagnosticMessageWithResult):
+ (WebKit::WebDiagnosticLoggingClient::logDiagnosticMessageWithValue):
+
2015-04-14 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.8.1 release.
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp (184088 => 184089)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp 2015-05-11 13:08:11 UTC (rev 184088)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp 2015-05-11 13:10:17 UTC (rev 184089)
@@ -43,7 +43,7 @@
void WebDiagnosticLoggingClient::logDiagnosticMessage(const String& message, const String& description)
{
- if (!m_page.corePage()->settings().diagnosticLoggingEnabled())
+ if (!m_page.corePage() || !m_page.corePage()->settings().diagnosticLoggingEnabled())
return;
// FIXME: Remove this injected bundle API.
@@ -53,7 +53,7 @@
void WebDiagnosticLoggingClient::logDiagnosticMessageWithResult(const String& message, const String& description, WebCore::DiagnosticLoggingResultType result)
{
- if (!m_page.corePage()->settings().diagnosticLoggingEnabled())
+ if (!m_page.corePage() || !m_page.corePage()->settings().diagnosticLoggingEnabled())
return;
// FIXME: Remove this injected bundle API.
@@ -63,7 +63,7 @@
void WebDiagnosticLoggingClient::logDiagnosticMessageWithValue(const String& message, const String& description, const String& value)
{
- if (!m_page.corePage()->settings().diagnosticLoggingEnabled())
+ if (!m_page.corePage() || !m_page.corePage()->settings().diagnosticLoggingEnabled())
return;
// FIXME: Remove this injected bundle API.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
