<!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>[175368] tags/Safari-601.1.6</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/175368">175368</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-10-30 00:37:16 -0700 (Thu, 30 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/175312">r175312</a>. rdar://problem/18808163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari60116LayoutTestsChangeLog">tags/Safari-601.1.6/LayoutTests/ChangeLog</a></li>
<li><a href="#tagsSafari60116SourceWebCoreChangeLog">tags/Safari-601.1.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari60116SourceWebCoreplatformnetworkHTTPHeaderMaph">tags/Safari-601.1.6/Source/WebCore/platform/network/HTTPHeaderMap.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#tagsSafari60116LayoutTestshttptestscachexhruncommonheaderexpectedtxt">tags/Safari-601.1.6/LayoutTests/http/tests/cache/xhr-uncommon-header-expected.txt</a></li>
<li><a href="#tagsSafari60116LayoutTestshttptestscachexhruncommonheaderhtml">tags/Safari-601.1.6/LayoutTests/http/tests/cache/xhr-uncommon-header.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari60116LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.6/LayoutTests/ChangeLog (175367 => 175368)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.6/LayoutTests/ChangeLog 2014-10-30 05:02:33 UTC (rev 175367)
+++ tags/Safari-601.1.6/LayoutTests/ChangeLog 2014-10-30 07:37:16 UTC (rev 175368)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-10-29 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r175312.
+
+ 2014-10-29 Chris Dumez <cdumez@apple.com>
+
+ Crash in CachedRawResource::canReuse() when reloading http://dnd.wizards.com/dungeons-and-dragons/story
+ https://bugs.webkit.org/show_bug.cgi?id=138164
+
+ Reviewed by Andreas Kling.
+
+ Add a layout test that does XHR loads from cache with only uncommon
+ HTTP headers to reproduce a crash in CachedRawResource::canReuse()
+ when iterating over a HTTPHeaderMap that had uncommon HTTP headers
+ but no common ones.
+
+ * http/tests/cache/xhr-uncommon-header-expected.txt: Added.
+ * http/tests/cache/xhr-uncommon-header.html: Added.
+
</ins><span class="cx"> 2014-10-28 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> CSS4 Selectors: Add the pseudo class :any-link
</span></span></pre></div>
<a id="tagsSafari60116LayoutTestshttptestscachexhruncommonheaderexpectedtxtfromrev175312trunkLayoutTestshttptestscachexhruncommonheaderexpectedtxt"></a>
<div class="copfile"><h4>Copied: tags/Safari-601.1.6/LayoutTests/http/tests/cache/xhr-uncommon-header-expected.txt (from rev 175312, trunk/LayoutTests/http/tests/cache/xhr-uncommon-header-expected.txt) (0 => 175368)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.6/LayoutTests/http/tests/cache/xhr-uncommon-header-expected.txt (rev 0)
+++ tags/Safari-601.1.6/LayoutTests/http/tests/cache/xhr-uncommon-header-expected.txt 2014-10-30 07:37:16 UTC (rev 175368)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Test that we don't crash on xhr loads from cache with only uncommon HTTP headers
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+load
+load
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="tagsSafari60116LayoutTestshttptestscachexhruncommonheaderhtmlfromrev175312trunkLayoutTestshttptestscachexhruncommonheaderhtml"></a>
<div class="copfile"><h4>Copied: tags/Safari-601.1.6/LayoutTests/http/tests/cache/xhr-uncommon-header.html (from rev 175312, trunk/LayoutTests/http/tests/cache/xhr-uncommon-header.html) (0 => 175368)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.6/LayoutTests/http/tests/cache/xhr-uncommon-header.html (rev 0)
+++ tags/Safari-601.1.6/LayoutTests/http/tests/cache/xhr-uncommon-header.html 2014-10-30 07:37:16 UTC (rev 175368)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<script src="/js-test-resources/js-test-pre.js"></script>
+<body>
+<script type="text/javascript">
+description("Test that we don't crash on xhr loads from cache with only uncommon HTTP headers");
+jsTestIsAsync = true;
+
+function repeat() {
+ var request2 = new XMLHttpRequest();
+ request2.addEventListener("load", function() { debug("load"); finishJSTest(); }, false);
+ request2.addEventListener("error", function() { debug("error"); finishJSTest(); }, false);
+ request2.addEventListener("abort", function() { debug("abort"); finishJSTest(); }, false);
+ request2.open("GET", "resources/empty.txt", true);
+ request2.setRequestHeader("X-Custom1", "test1");
+ request2.send();
+}
+
+var request = new XMLHttpRequest();
+request.addEventListener("load", function() { debug("load"); repeat(); }, false);
+request.addEventListener("error", function() { debug("error"); repeat(); }, false);
+request.addEventListener("abort", function() { debug("abort"); repeat(); }, false);
+request.open("GET", "resources/empty.txt", true);
+request.setRequestHeader("X-Custom1", "test1");
+request.send();
+</script>
+<script src="/js-test-resources/js-test-post.js"></script>
+</body>
</ins></span></pre></div>
<a id="tagsSafari60116SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.6/Source/WebCore/ChangeLog (175367 => 175368)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.6/Source/WebCore/ChangeLog 2014-10-30 05:02:33 UTC (rev 175367)
+++ tags/Safari-601.1.6/Source/WebCore/ChangeLog 2014-10-30 07:37:16 UTC (rev 175368)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-10-29 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r175312.
+
+ 2014-10-29 Chris Dumez <cdumez@apple.com>
+
+ Crash in CachedRawResource::canReuse() when reloading http://dnd.wizards.com/dungeons-and-dragons/story
+ https://bugs.webkit.org/show_bug.cgi?id=138164
+
+ Reviewed by Andreas Kling.
+
+ This patch fixes a crash when reloading the following URL:
+ http://dnd.wizards.com/dungeons-and-dragons/story
+
+ We were crashing in CachedRawResource::canReuse() because header.key
+ would sometimes be a null String and we would call
+ HashMap::get(nullString).
+
+ The real issue was that header.key was null in the first place, which
+ means that even though the HTTPHeaderMap iterator is valid, it->key
+ is a null String, which should never happen. There was a bug in the
+ HTTPHeaderMapConstIterator() constructor that would cause the
+ iterator key/value pair to not get initialized if the HTTPHeaderMap
+ contained *only* uncommon HTTP headers. This patch updates the
+ constructor so that we fall back to updating the key/value from the
+ uncommon header map, if we failed to initialized from the common
+ header map (because it was empty).
+
+ Test: http/tests/cache/xhr-uncommon-header.html
+
+ * platform/network/HTTPHeaderMap.h:
+ (WebCore::HTTPHeaderMap::HTTPHeaderMapConstIterator::HTTPHeaderMapConstIterator):
+
</ins><span class="cx"> 2014-10-28 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> CSS4 Selectors: Add the pseudo class :any-link
</span></span></pre></div>
<a id="tagsSafari60116SourceWebCoreplatformnetworkHTTPHeaderMaph"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.6/Source/WebCore/platform/network/HTTPHeaderMap.h (175367 => 175368)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.6/Source/WebCore/platform/network/HTTPHeaderMap.h 2014-10-30 05:02:33 UTC (rev 175367)
+++ tags/Safari-601.1.6/Source/WebCore/platform/network/HTTPHeaderMap.h 2014-10-30 07:37:16 UTC (rev 175368)
</span><span class="lines">@@ -57,7 +57,8 @@
</span><span class="cx"> , m_commonHeadersIt(commonHeadersIt)
</span><span class="cx"> , m_uncommonHeadersIt(uncommonHeadersIt)
</span><span class="cx"> {
</span><del>- updateKeyValue(m_commonHeadersIt);
</del><ins>+ if (!updateKeyValue(m_commonHeadersIt))
+ updateKeyValue(m_uncommonHeadersIt);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> struct KeyValue {
</span></span></pre>
</div>
</div>
</body>
</html>