Title: [201444] trunk/Source/WebKit2
- Revision
- 201444
- Author
- beid...@apple.com
- Date
- 2016-05-26 20:19:20 -0700 (Thu, 26 May 2016)
Log Message
Certain NetworkResourceLoader callbacks can deref a null m_networkLoad.
https://bugs.webkit.org/show_bug.cgi?id=158134
Reviewed by Alex Christensen.
It's legit for m_networkLoad to be null in these callbacks.
We need null checks, just like we have in many other callbacks in this class.
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::continueWillSendRequest):
(WebKit::NetworkResourceLoader::continueCanAuthenticateAgainstProtectionSpace):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (201443 => 201444)
--- trunk/Source/WebKit2/ChangeLog 2016-05-27 01:41:18 UTC (rev 201443)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-27 03:19:20 UTC (rev 201444)
@@ -1,3 +1,18 @@
+2016-05-26 Brady Eidson <beid...@apple.com>
+
+ Certain NetworkResourceLoader callbacks can deref a null m_networkLoad.
+ https://bugs.webkit.org/show_bug.cgi?id=158134
+
+ Reviewed by Alex Christensen.
+
+ It's legit for m_networkLoad to be null in these callbacks.
+
+ We need null checks, just like we have in many other callbacks in this class.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::continueWillSendRequest):
+ (WebKit::NetworkResourceLoader::continueCanAuthenticateAgainstProtectionSpace):
+
2016-05-26 Darin Adler <da...@apple.com>
Media queries and platform screen modernization and streamlining
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (201443 => 201444)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-05-27 01:41:18 UTC (rev 201443)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-05-27 03:19:20 UTC (rev 201444)
@@ -454,7 +454,9 @@
return;
}
#endif
- m_networkLoad->continueWillSendRequest(newRequest);
+
+ if (m_networkLoad)
+ m_networkLoad->continueWillSendRequest(newRequest);
}
void NetworkResourceLoader::continueDidReceiveResponse()
@@ -642,7 +644,8 @@
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
void NetworkResourceLoader::continueCanAuthenticateAgainstProtectionSpace(bool result)
{
- m_networkLoad->continueCanAuthenticateAgainstProtectionSpace(result);
+ if (m_networkLoad)
+ m_networkLoad->continueCanAuthenticateAgainstProtectionSpace(result);
}
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
