<!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>[205694] trunk</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/205694">205694</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2016-09-08 22:11:25 -0700 (Thu, 08 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WTF] HashTable's rehash is not compatible to Ref<T> and ASan
https://bugs.webkit.org/show_bug.cgi?id=161763
Reviewed by Mark Lam.
Source/WebCore:
Include wtf/text/StringHash.h to avoid linking errors in EFL port.
* loader/ResourceLoadStatistics.h:
Source/WTF:
If we move an object, the location which the moved object used should not be touched anymore.
HashTable::rehash performs WTFMove for the object that resides in the old table.
However, after moving it, we accidentally touch this location by using `!isEmptyOrDeletedBucket(table[i])`
in HashTable::deallocateTable. And it causes ASan crashing if we use Ref<> for HashTable's key or value.
In this patch, we call the destructor right after moving the object. And HashTable::rehash just calls
fastFree since all the objects in the old table are already moved and destructed.
And we also change HashTable::deallocate to destruct only live objects. Calling destructors for empty objects
is meaningless. And according to the Ref<>'s comment, empty object is not designed to be destructed.
* wtf/HashTable.h:
(WTF::KeyTraits>::deallocateTable):
Tools:
Add tests that inserts many Ref<>s. It incurs HashTable::rehash, and we can ensure
that ASan crash does not occur with this patch.
* TestWebKitAPI/Tests/WTF/HashMap.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WTF/HashSet.cpp:
(TestWebKitAPI::TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfHashTableh">trunk/Source/WTF/wtf/HashTable.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadStatisticsh">trunk/Source/WebCore/loader/ResourceLoadStatistics.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFHashMapcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFHashSetcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/HashSet.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (205693 => 205694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-09-09 05:07:45 UTC (rev 205693)
+++ trunk/Source/WTF/ChangeLog 2016-09-09 05:11:25 UTC (rev 205694)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-09-08 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [WTF] HashTable's rehash is not compatible to Ref<T> and ASan
+ https://bugs.webkit.org/show_bug.cgi?id=161763
+
+ Reviewed by Mark Lam.
+
+ If we move an object, the location which the moved object used should not be touched anymore.
+ HashTable::rehash performs WTFMove for the object that resides in the old table.
+ However, after moving it, we accidentally touch this location by using `!isEmptyOrDeletedBucket(table[i])`
+ in HashTable::deallocateTable. And it causes ASan crashing if we use Ref<> for HashTable's key or value.
+
+ In this patch, we call the destructor right after moving the object. And HashTable::rehash just calls
+ fastFree since all the objects in the old table are already moved and destructed.
+ And we also change HashTable::deallocate to destruct only live objects. Calling destructors for empty objects
+ is meaningless. And according to the Ref<>'s comment, empty object is not designed to be destructed.
+
+ * wtf/HashTable.h:
+ (WTF::KeyTraits>::deallocateTable):
+
</ins><span class="cx"> 2016-09-08 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Heap::isMarked() shouldn't pay the price of concurrent lazy flipping
</span></span></pre></div>
<a id="trunkSourceWTFwtfHashTableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/HashTable.h (205693 => 205694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/HashTable.h 2016-09-09 05:07:45 UTC (rev 205693)
+++ trunk/Source/WTF/wtf/HashTable.h 2016-09-09 05:11:25 UTC (rev 205694)
</span><span class="lines">@@ -1153,7 +1153,7 @@
</span><span class="cx"> void HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::deallocateTable(ValueType* table, unsigned size)
</span><span class="cx"> {
</span><span class="cx"> for (unsigned i = 0; i < size; ++i) {
</span><del>- if (!isDeletedBucket(table[i]))
</del><ins>+ if (!isEmptyOrDeletedBucket(table[i]))
</ins><span class="cx"> table[i].~ValueType();
</span><span class="cx"> }
</span><span class="cx"> fastFree(table);
</span><span class="lines">@@ -1203,6 +1203,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Value* reinsertedEntry = reinsert(WTFMove(oldTable[i]));
</span><ins>+ oldTable[i].~ValueType();
</ins><span class="cx"> if (std::addressof(oldTable[i]) == entry) {
</span><span class="cx"> ASSERT(!newEntry);
</span><span class="cx"> newEntry = reinsertedEntry;
</span><span class="lines">@@ -1211,7 +1212,7 @@
</span><span class="cx">
</span><span class="cx"> m_deletedCount = 0;
</span><span class="cx">
</span><del>- deallocateTable(oldTable, oldTableSize);
</del><ins>+ fastFree(oldTable);
</ins><span class="cx">
</span><span class="cx"> internalCheckTableConsistency();
</span><span class="cx"> return newEntry;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205693 => 205694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-09 05:07:45 UTC (rev 205693)
+++ trunk/Source/WebCore/ChangeLog 2016-09-09 05:11:25 UTC (rev 205694)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-08 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [WTF] HashTable's rehash is not compatible to Ref<T> and ASan
+ https://bugs.webkit.org/show_bug.cgi?id=161763
+
+ Reviewed by Mark Lam.
+
+ Include wtf/text/StringHash.h to avoid linking errors in EFL port.
+
+ * loader/ResourceLoadStatistics.h:
+
</ins><span class="cx"> 2016-09-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> HTMLObjectElement.hspace / vspace attributes should be unsigned
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadStatisticsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadStatistics.h (205693 => 205694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadStatistics.h 2016-09-09 05:07:45 UTC (rev 205693)
+++ trunk/Source/WebCore/loader/ResourceLoadStatistics.h 2016-09-09 05:11:25 UTC (rev 205694)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define ResourceLoadStatistics_h
</span><span class="cx">
</span><span class="cx"> #include <wtf/HashCountedSet.h>
</span><ins>+#include <wtf/text/StringHash.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205693 => 205694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-09 05:07:45 UTC (rev 205693)
+++ trunk/Tools/ChangeLog 2016-09-09 05:11:25 UTC (rev 205694)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-09-08 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [WTF] HashTable's rehash is not compatible to Ref<T> and ASan
+ https://bugs.webkit.org/show_bug.cgi?id=161763
+
+ Reviewed by Mark Lam.
+
+ Add tests that inserts many Ref<>s. It incurs HashTable::rehash, and we can ensure
+ that ASan crash does not occur with this patch.
+
+ * TestWebKitAPI/Tests/WTF/HashMap.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WTF/HashSet.cpp:
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2016-09-08 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> URLParser: Handle \ in paths of special URLs according to spec
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFHashMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp (205693 => 205694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp 2016-09-09 05:07:45 UTC (rev 205693)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp 2016-09-09 05:11:25 UTC (rev 205694)
</span><span class="lines">@@ -789,6 +789,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</span><ins>+
+ {
+ HashMap<Ref<RefLogger>, int> map;
+ for (int i = 0; i < 64; ++i) {
+ Ref<RefLogger> ref = adoptRef(*new RefLogger("a"));
+ auto* pointer = ref.ptr();
+ map.add(WTFMove(ref), i + 1);
+ ASSERT_TRUE(map.contains(pointer));
+ }
+ }
+
+ ASSERT_STREQ("deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WTF_HashMap, Ref_Value)
</span><span class="lines">@@ -890,6 +902,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</span><ins>+
+ {
+ HashMap<int, Ref<RefLogger>> map;
+ for (int i = 0; i < 64; ++i) {
+ Ref<RefLogger> ref = adoptRef(*new RefLogger("a"));
+ map.add(i + 1, WTFMove(ref));
+ ASSERT_TRUE(map.contains(i + 1));
+ }
+ }
+
+ ASSERT_STREQ("deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WTF_HashMap, DeletedAddressOfOperator)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFHashSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/HashSet.cpp (205693 => 205694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/HashSet.cpp 2016-09-09 05:07:45 UTC (rev 205693)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/HashSet.cpp 2016-09-09 05:11:25 UTC (rev 205694)
</span><span class="lines">@@ -428,6 +428,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT_STREQ("ref(a) deref(a) ", takeLogStr().c_str());
</span><ins>+
+ {
+ HashSet<Ref<RefLogger>> set;
+ for (int i = 0; i < 64; ++i) {
+ Ref<RefLogger> ref = adoptRef(*new RefLogger("a"));
+ auto* pointer = ref.ptr();
+ set.add(WTFMove(ref));
+ ASSERT_TRUE(set.contains(pointer));
+ }
+ }
+ ASSERT_STREQ("deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) deref(a) ", takeLogStr().c_str());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WTF_HashSet, DeletedAddressOfOperator)
</span></span></pre>
</div>
</div>
</body>
</html>