<!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>[170831] trunk/Source/WebKit2</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/170831">170831</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2014-07-06 17:01:23 -0700 (Sun, 06 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Speculative fix for: NetworkProcess sometimes hangs under copyDefaultCredentialForProtectionSpace
https://bugs.webkit.org/show_bug.cgi?id=134666
Reviewed by Tim Horton.
* Shared/mac/SecItemRequestData.cpp:
(WebKit::SecItemRequestData::encode): Encode whether or not the query dictionary exists.
(WebKit::SecItemRequestData::decode): Only fail when query dictionary fails to decode if we expect one.
* UIProcess/mac/SecItemShimProxy.cpp:
(WebKit::SecItemShimProxy::secItemRequest): If the request is of type Invalid, log an error message asking
for a bug, and respond with an "invalid parameter" error.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedmacSecItemRequestDatacpp">trunk/Source/WebKit2/Shared/mac/SecItemRequestData.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacSecItemShimProxycpp">trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170830 => 170831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-06 20:05:03 UTC (rev 170830)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-07 00:01:23 UTC (rev 170831)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-07-06 Brady Eidson <beidson@apple.com>
+
+ Speculative fix for: NetworkProcess sometimes hangs under copyDefaultCredentialForProtectionSpace
+ https://bugs.webkit.org/show_bug.cgi?id=134666
+
+ Reviewed by Tim Horton.
+
+ * Shared/mac/SecItemRequestData.cpp:
+ (WebKit::SecItemRequestData::encode): Encode whether or not the query dictionary exists.
+ (WebKit::SecItemRequestData::decode): Only fail when query dictionary fails to decode if we expect one.
+
+ * UIProcess/mac/SecItemShimProxy.cpp:
+ (WebKit::SecItemShimProxy::secItemRequest): If the request is of type Invalid, log an error message asking
+ for a bug, and respond with an "invalid parameter" error.
+
</ins><span class="cx"> 2014-07-06 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Don't throttle layer flushes when the main resource is a GIF
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacSecItemRequestDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/SecItemRequestData.cpp (170830 => 170831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/SecItemRequestData.cpp 2014-07-06 20:05:03 UTC (rev 170830)
+++ trunk/Source/WebKit2/Shared/mac/SecItemRequestData.cpp 2014-07-07 00:01:23 UTC (rev 170831)
</span><span class="lines">@@ -53,7 +53,9 @@
</span><span class="cx"> {
</span><span class="cx"> encoder.encodeEnum(m_type);
</span><span class="cx">
</span><del>- IPC::encode(encoder, m_queryDictionary.get());
</del><ins>+ encoder << static_cast<bool>(m_queryDictionary);
+ if (m_queryDictionary)
+ IPC::encode(encoder, m_queryDictionary.get());
</ins><span class="cx">
</span><span class="cx"> encoder << static_cast<bool>(m_attributesToMatch);
</span><span class="cx"> if (m_attributesToMatch)
</span><span class="lines">@@ -61,12 +63,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool SecItemRequestData::decode(IPC::ArgumentDecoder& decoder, SecItemRequestData& secItemRequestData)
</span><del>-{
</del><ins>+{
</ins><span class="cx"> if (!decoder.decodeEnum(secItemRequestData.m_type))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (!IPC::decode(decoder, secItemRequestData.m_queryDictionary))
</del><ins>+ bool expectQuery;
+ if (!decoder.decode(expectQuery))
</ins><span class="cx"> return false;
</span><ins>+
+ if (expectQuery && !IPC::decode(decoder, secItemRequestData.m_queryDictionary))
+ return false;
</ins><span class="cx">
</span><span class="cx"> bool expectAttributes;
</span><span class="cx"> if (!decoder.decode(expectAttributes))
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacSecItemShimProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp (170830 => 170831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp 2014-07-06 20:05:03 UTC (rev 170830)
+++ trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp 2014-07-07 00:01:23 UTC (rev 170831)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "SecItemResponseData.h"
</span><span class="cx"> #include "SecItemShimMessages.h"
</span><span class="cx"> #include "SecItemShimProxyMessages.h"
</span><ins>+#include <Security/SecBase.h>
</ins><span class="cx"> #include <Security/SecItem.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -62,8 +63,9 @@
</span><span class="cx">
</span><span class="cx"> switch (request.type()) {
</span><span class="cx"> case SecItemRequestData::Invalid:
</span><del>- ASSERT_NOT_REACHED();
- return;
</del><ins>+ LOG_ERROR("SecItemShimProxy::secItemRequest received an invalid data request. Please file a bug if you know how you caused this.");
+ response = SecItemResponseData(errSecParam, nullptr);
+ break;
</ins><span class="cx">
</span><span class="cx"> case SecItemRequestData::CopyMatching: {
</span><span class="cx"> CFTypeRef resultObject = 0;
</span></span></pre>
</div>
</div>
</body>
</html>