Changeset 230771 in webkit

Timestamp:

Apr 18, 2018, 11:55:59 AM (8 years ago)

Author:

Brent Fulgham

Message:

Avoid crash if ITP Debug mode is on, but ResourceLoadStatistics are not being used
​https://bugs.webkit.org/show_bug.cgi?id=184739
<rdar://problem/39287964>

Reviewed by David Kilzer.

If a user has the ResourceLoadStatistics logic turned off, but has the ITP Debug experimental
flag turned on, you can cause a crash.

This is because the WebsiteDataStore for the process doesn't bother creating a ResourceLoadStatisticsStore
if the statistics machinery is not running. The ITP debug flag was being blindly set without checking
if the statistics store exists or not, which can cause a crash.

• UIProcess/WebsiteData/WebsiteDataStore.cpp:

(WebKit::WebsiteDataStore::setResourceLoadStatisticsDebugMode): Check if the statistics store exists
before calling functions on it.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebsiteData/WebsiteDataStore.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-04-18  Brent Fulgham  <bfulgham@apple.com>
+
+        Avoid crash if ITP Debug mode is on, but ResourceLoadStatistics are not being used
+        https://bugs.webkit.org/show_bug.cgi?id=184739
+        <rdar://problem/39287964>
+
+        Reviewed by David Kilzer.
+
+        If a user has the ResourceLoadStatistics logic turned off, but has the ITP Debug experimental
+        flag turned on, you can cause a crash.
+
+        This is because the WebsiteDataStore for the process doesn't bother creating a ResourceLoadStatisticsStore
+        if the statistics machinery is not running. The ITP debug flag was being blindly set without checking
+        if the statistics store exists or not, which can cause a crash.
+
+        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+        (WebKit::WebsiteDataStore::setResourceLoadStatisticsDebugMode): Check if the statistics store exists
+        before calling functions on it.
+
 2018-04-18  Paul Knight  <pknight@apple.com>
 

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp

@@ -1436 +1436 @@
 {
     m_resourceLoadStatisticsDebugMode = enabled;
-    m_resourceLoadStatistics->setResourceLoadStatisticsDebugMode(enabled);
+    if (m_resourceLoadStatistics)
+        m_resourceLoadStatistics->setResourceLoadStatisticsDebugMode(enabled);
 }