Title: [227831] branches/safari-605-branch/Source/WebKit
- Revision
- 227831
- Author
- [email protected]
- Date
- 2018-01-30 10:51:34 -0800 (Tue, 30 Jan 2018)
Log Message
Cherry-pick r227754. rdar://problem/37019474
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebKit/ChangeLog (227830 => 227831)
--- branches/safari-605-branch/Source/WebKit/ChangeLog 2018-01-30 18:51:33 UTC (rev 227830)
+++ branches/safari-605-branch/Source/WebKit/ChangeLog 2018-01-30 18:51:34 UTC (rev 227831)
@@ -1,5 +1,24 @@
2018-01-30 Jason Marcell <[email protected]>
+ Cherry-pick r227754. rdar://problem/37019474
+
+ 2018-01-29 Alex Christensen <[email protected]>
+
+ Fix crash when during canAuthenticateAgainstProtectionSpace
+ https://bugs.webkit.org/show_bug.cgi?id=182260
+ <rdar://problem/34911343>
+
+ Reviewed by Chris Dumez.
+
+ If we have a valid network load with no challenge completion handler and we are
+ telling it to continue with the challenge handling, something has gone wrong.
+ Maybe we've just recovered from a crashed network process. If this happens, do nothing.
+
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::continueCanAuthenticateAgainstProtectionSpace):
+
+2018-01-30 Jason Marcell <[email protected]>
+
Cherry-pick r227751. rdar://problem/37019491
2018-01-29 Chris Dumez <[email protected]>
Modified: branches/safari-605-branch/Source/WebKit/NetworkProcess/NetworkLoad.cpp (227830 => 227831)
--- branches/safari-605-branch/Source/WebKit/NetworkProcess/NetworkLoad.cpp 2018-01-30 18:51:33 UTC (rev 227830)
+++ branches/safari-605-branch/Source/WebKit/NetworkProcess/NetworkLoad.cpp 2018-01-30 18:51:34 UTC (rev 227831)
@@ -353,7 +353,11 @@
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
void NetworkLoad::continueCanAuthenticateAgainstProtectionSpace(bool result)
{
- ASSERT(m_challengeCompletionHandler);
+ if (!m_challengeCompletionHandler) {
+ ASSERT_NOT_REACHED();
+ return;
+ }
+
auto completionHandler = std::exchange(m_challengeCompletionHandler, nullptr);
if (!result) {
if (NetworkSession::allowsSpecificHTTPSCertificateForHost(*m_challenge))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
