<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[175130] branches/safari-600.1.4.12-branch/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/175130">175130</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-10-23 11:01:53 -0700 (Thu, 23 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/174827">r174827</a>. rdar://problem/18742369</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001412branchSourceWebCoreChangeLog">branches/safari-600.1.4.12-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001412branchSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp">branches/safari-600.1.4.12-branch/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001412branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.12-branch/Source/WebCore/ChangeLog (175129 => 175130)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.12-branch/Source/WebCore/ChangeLog 2014-10-23 17:55:15 UTC (rev 175129)
+++ branches/safari-600.1.4.12-branch/Source/WebCore/ChangeLog 2014-10-23 18:01:53 UTC (rev 175130)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2014-10-23 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r174827.
+
+ 2014-10-17 Alexey Proskuryakov <ap@apple.com>
+
+ [iOS] Crash when load is canceled while waiting for the user to type HTTP authentication credentials
+ https://bugs.webkit.org/show_bug.cgi?id=137826
+ rdar://problem/17329599
+
+ Reviewed by Brady Eidson.
+
+ No new tests, as we don't have a way to simulate details of user interaction with
+ an auth dialog.
+
+ * platform/network/cf/ResourceHandleCFNet.cpp:
+ (WebCore::ResourceHandle::receivedCredential):
+ (WebCore::ResourceHandle::receivedRequestToContinueWithoutCredential):
+ (WebCore::ResourceHandle::receivedRequestToPerformDefaultHandling):
+ (WebCore::ResourceHandle::receivedChallengeRejection):
+ Added null checks before passing m_connection for CFNetwork functions, making this
+ match what Mac code does when sending a message to a nil receiver.
+
+2014-10-23 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r174846.
</span><span class="cx">
</span><span class="cx"> 2014-10-17 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari6001412branchSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.12-branch/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (175129 => 175130)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.12-branch/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2014-10-23 17:55:15 UTC (rev 175129)
+++ branches/safari-600.1.4.12-branch/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp 2014-10-23 18:01:53 UTC (rev 175130)
</span><span class="lines">@@ -423,8 +423,9 @@
</span><span class="cx"> urlToStore = challenge.failureResponse().url();
</span><span class="cx"> CredentialStorage::set(webCredential, challenge.protectionSpace(), urlToStore);
</span><span class="cx">
</span><del>- CFURLConnectionUseCredential(d->m_connection.get(), cfCredential.get(), challenge.cfURLAuthChallengeRef());
- } else {
</del><ins>+ if (d->m_connection)
+ CFURLConnectionUseCredential(d->m_connection.get(), cfCredential.get(), challenge.cfURLAuthChallengeRef());
+ } else if (d->m_connection) {
</ins><span class="cx"> RetainPtr<CFURLCredentialRef> cfCredential = adoptCF(createCF(credential));
</span><span class="cx"> CFURLConnectionUseCredential(d->m_connection.get(), cfCredential.get(), challenge.cfURLAuthChallengeRef());
</span><span class="cx"> }
</span><span class="lines">@@ -440,7 +441,8 @@
</span><span class="cx"> if (challenge != d->m_currentWebChallenge)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- CFURLConnectionUseCredential(d->m_connection.get(), 0, challenge.cfURLAuthChallengeRef());
</del><ins>+ if (d->m_connection)
+ CFURLConnectionUseCredential(d->m_connection.get(), 0, challenge.cfURLAuthChallengeRef());
</ins><span class="cx">
</span><span class="cx"> clearAuthentication();
</span><span class="cx"> }
</span><span class="lines">@@ -463,7 +465,8 @@
</span><span class="cx"> if (challenge != d->m_currentWebChallenge)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- CFURLConnectionPerformDefaultHandlingForChallenge(d->m_connection.get(), challenge.cfURLAuthChallengeRef());
</del><ins>+ if (d->m_connection)
+ CFURLConnectionPerformDefaultHandlingForChallenge(d->m_connection.get(), challenge.cfURLAuthChallengeRef());
</ins><span class="cx">
</span><span class="cx"> clearAuthentication();
</span><span class="cx"> }
</span><span class="lines">@@ -476,7 +479,8 @@
</span><span class="cx"> if (challenge != d->m_currentWebChallenge)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- CFURLConnectionRejectChallenge(d->m_connection.get(), challenge.cfURLAuthChallengeRef());
</del><ins>+ if (d->m_connection)
+ CFURLConnectionRejectChallenge(d->m_connection.get(), challenge.cfURLAuthChallengeRef());
</ins><span class="cx">
</span><span class="cx"> clearAuthentication();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>