Changeset 254611 in webkit

Timestamp:

Jan 15, 2020, 11:15:47 AM (7 years ago)

Author:

Alan Coon

Message:

Cherry-pick r254310. rdar://problem/58552856

Check the existence of the optional m_sessionID before using it in WebProcess::setResourceLoadStatisticsEnabled()
​https://bugs.webkit.org/show_bug.cgi?id=206035
<rdar://problem/58455306>

Reviewed by Brent Fulgham.

No new tests.

• WebProcess/WebProcess.cpp: (WebKit::WebProcess::setResourceLoadStatisticsEnabled):

Added a check that m_sessionID exists.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@254310 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-609-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebProcess.cpp (modified) (1 diff)

branches/safari-609-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2020-01-14  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r254310. rdar://problem/58552856
+
+    Check the existence of the optional m_sessionID before using it in WebProcess::setResourceLoadStatisticsEnabled()
+    https://bugs.webkit.org/show_bug.cgi?id=206035
+    <rdar://problem/58455306>
+    
+    Reviewed by Brent Fulgham.
+    
+    No new tests.
+    
+    * WebProcess/WebProcess.cpp:
+    (WebKit::WebProcess::setResourceLoadStatisticsEnabled):
+        Added a check that m_sessionID exists.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254310 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-01-09  John Wilander  <wilander@apple.com>
+
+            Check the existence of the optional m_sessionID before using it in WebProcess::setResourceLoadStatisticsEnabled()
+            https://bugs.webkit.org/show_bug.cgi?id=206035
+            <rdar://problem/58455306>
+
+            Reviewed by Brent Fulgham.
+
+            No new tests.
+
+            * WebProcess/WebProcess.cpp:
+            (WebKit::WebProcess::setResourceLoadStatisticsEnabled):
+                Added a check that m_sessionID exists.
+
 2020-01-14  Alan Coon  <alancoon@apple.com>
 

branches/safari-609-branch/Source/WebKit/WebProcess/WebProcess.cpp

@@ -1635 +1635 @@
 void WebProcess::setResourceLoadStatisticsEnabled(bool enabled)
 {
-    if (WebCore::DeprecatedGlobalSettings::resourceLoadStatisticsEnabled() == enabled || m_sessionID->isEphemeral())
+    if (WebCore::DeprecatedGlobalSettings::resourceLoadStatisticsEnabled() == enabled || (m_sessionID && m_sessionID->isEphemeral()))
         return;
     WebCore::DeprecatedGlobalSettings::setResourceLoadStatisticsEnabled(enabled);