Title: [199443] releases/WebKitGTK/webkit-2.12/Source/WebKit2
- Revision
- 199443
- Author
- [email protected]
- Date
- 2016-04-13 02:20:58 -0700 (Wed, 13 Apr 2016)
Log Message
Merge r198629 - Fix null dereferencing in NetworkLoad::continueCanAuthenticateAgainstProtectionSpace
https://bugs.webkit.org/show_bug.cgi?id=155799
rdar://25289012
Reviewed by Tim Horton.
* NetworkProcess/NetworkLoad.cpp:
(WebKit::NetworkLoad::continueCanAuthenticateAgainstProtectionSpace):
Null-check all the things!
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog (199442 => 199443)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-04-13 09:19:06 UTC (rev 199442)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-04-13 09:20:58 UTC (rev 199443)
@@ -1,3 +1,15 @@
+2016-03-24 Alex Christensen <[email protected]>
+
+ Fix null dereferencing in NetworkLoad::continueCanAuthenticateAgainstProtectionSpace
+ https://bugs.webkit.org/show_bug.cgi?id=155799
+ rdar://25289012
+
+ Reviewed by Tim Horton.
+
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::continueCanAuthenticateAgainstProtectionSpace):
+ Null-check all the things!
+
2016-03-22 Alberto Garcia <[email protected]>
Unreviewed typo fixes.
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (199442 => 199443)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-04-13 09:19:06 UTC (rev 199442)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-04-13 09:20:58 UTC (rev 199443)
@@ -348,13 +348,15 @@
return;
}
- if (auto* pendingDownload = m_task->pendingDownload())
- NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(*pendingDownload, m_challenge, completionHandler);
- else
- NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(m_parameters.webPageID, m_parameters.webFrameID, m_challenge, completionHandler);
-#else
- m_handle->continueCanAuthenticateAgainstProtectionSpace(result);
+ if (m_task) {
+ if (auto* pendingDownload = m_task->pendingDownload())
+ NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(*pendingDownload, m_challenge, completionHandler);
+ else
+ NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(m_parameters.webPageID, m_parameters.webFrameID, m_challenge, completionHandler);
+ }
#endif
+ if (m_handle)
+ m_handle->continueCanAuthenticateAgainstProtectionSpace(result);
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
