<!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>[183898] 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/183898">183898</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-05-06 16:32:59 -0700 (Wed, 06 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Addition review followup for:
Crash executing null AsyncRequest in IDB code.
<rdar://problem/18854856> and https://bugs.webkit.org/show_bug.cgi?id=144715
Reviewed by Darin Adler.
This patch adds a layer on top of the UniqueIDBDatabase request map to catch this coding mistake in the future.
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
(WebKit::UniqueIDBDatabase::didCompleteBoolRequest): Get rid of the ASSERT and the temporary variable,
make it a single line which reads better.
(WebKit::UniqueIDBDatabase::didPutRecordInBackingStore): Ditto.
(WebKit::UniqueIDBDatabase::didGetRecordFromBackingStore): Ditto.
(WebKit::UniqueIDBDatabase::didOpenCursorInBackingStore): Ditto.
(WebKit::UniqueIDBDatabase::didAdvanceCursorInBackingStore): Ditto.
(WebKit::UniqueIDBDatabase::didIterateCursorInBackingStore): Ditto.
(WebKit::UniqueIDBDatabase::didCountInBackingStore): Ditto.
(WebKit::UniqueIDBDatabase::didDeleteRangeInBackingStore): Ditto.
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.h: Ditto.
Add the class AsyncRequestMap which shadows a HashMap but does aggressive runtime checks
in ::take() to make sure the same request was not dispatched twice in a row, and makes sure we
never try to execute a null AsyncRequest by way of a RELEASE_ASSERT.
* Shared/AsyncRequest.h:
(WebKit::AsyncRequestMap::AsyncRequestMap):
(WebKit::AsyncRequestMap::take):
(WebKit::AsyncRequestMap::add):
(WebKit::AsyncRequestMap::clear):
(WebKit::AsyncRequestMap::values):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAsyncRequesth">trunk/Source/WebKit2/Shared/AsyncRequest.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183897 => 183898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-06 23:14:14 UTC (rev 183897)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-06 23:32:59 UTC (rev 183898)
</span><span class="lines">@@ -1,10 +1,42 @@
</span><span class="cx"> 2015-05-06 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ Addition review followup for:
</ins><span class="cx"> Crash executing null AsyncRequest in IDB code.
</span><span class="cx"> <rdar://problem/18854856> and https://bugs.webkit.org/show_bug.cgi?id=144715
</span><span class="cx">
</span><span class="cx"> Reviewed by Darin Adler.
</span><span class="cx">
</span><ins>+ This patch adds a layer on top of the UniqueIDBDatabase request map to catch this coding mistake in the future.
+
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
+ (WebKit::UniqueIDBDatabase::didCompleteBoolRequest): Get rid of the ASSERT and the temporary variable,
+ make it a single line which reads better.
+ (WebKit::UniqueIDBDatabase::didPutRecordInBackingStore): Ditto.
+ (WebKit::UniqueIDBDatabase::didGetRecordFromBackingStore): Ditto.
+ (WebKit::UniqueIDBDatabase::didOpenCursorInBackingStore): Ditto.
+ (WebKit::UniqueIDBDatabase::didAdvanceCursorInBackingStore): Ditto.
+ (WebKit::UniqueIDBDatabase::didIterateCursorInBackingStore): Ditto.
+ (WebKit::UniqueIDBDatabase::didCountInBackingStore): Ditto.
+ (WebKit::UniqueIDBDatabase::didDeleteRangeInBackingStore): Ditto.
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.h: Ditto.
+
+ Add the class AsyncRequestMap which shadows a HashMap but does aggressive runtime checks
+ in ::take() to make sure the same request was not dispatched twice in a row, and makes sure we
+ never try to execute a null AsyncRequest by way of a RELEASE_ASSERT.
+ * Shared/AsyncRequest.h:
+ (WebKit::AsyncRequestMap::AsyncRequestMap):
+ (WebKit::AsyncRequestMap::take):
+ (WebKit::AsyncRequestMap::add):
+ (WebKit::AsyncRequestMap::clear):
+ (WebKit::AsyncRequestMap::values):
+
+2015-05-06 Brady Eidson <beidson@apple.com>
+
+ Crash executing null AsyncRequest in IDB code.
+ <rdar://problem/18854856> and https://bugs.webkit.org/show_bug.cgi?id=144715
+
+ Reviewed by Darin Adler.
+
</ins><span class="cx"> When UniqueIDBDatabase fails to execute an operation on the database work queue it usually
</span><span class="cx"> dispatches an AsyncRequest ID back to the main thread with an error callback.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp (183897 => 183898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2015-05-06 23:14:14 UTC (rev 183897)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2015-05-06 23:32:59 UTC (rev 183898)
</span><span class="lines">@@ -405,10 +405,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::didCompleteBoolRequest(uint64_t requestID, bool success)
</span><span class="cx"> {
</span><del>- RefPtr<AsyncRequest> request = m_pendingDatabaseTasks.take(requestID);
- ASSERT(request);
-
- request->completeRequest(success);
</del><ins>+ m_pendingDatabaseTasks.take(requestID).get().completeRequest(success);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::createObjectStore(const IDBIdentifier& transactionIdentifier, const IDBObjectStoreMetadata& metadata, std::function<void (bool)> successCallback)
</span><span class="lines">@@ -889,10 +886,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::didPutRecordInBackingStore(uint64_t requestID, const IDBKeyData& keyData, uint32_t errorCode, const String& errorMessage)
</span><span class="cx"> {
</span><del>- RefPtr<AsyncRequest> request = m_pendingDatabaseTasks.take(requestID);
- ASSERT(request);
-
- request->completeRequest(keyData, errorCode, errorMessage);
</del><ins>+ m_pendingDatabaseTasks.take(requestID).get().completeRequest(keyData, errorCode, errorMessage);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::getRecordFromBackingStore(uint64_t requestID, const IDBIdentifier& transaction, const IDBObjectStoreMetadata& objectStoreMetadata, int64_t indexID, const IDBKeyRangeData& keyRangeData, IndexedDB::CursorType cursorType)
</span><span class="lines">@@ -950,10 +944,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::didGetRecordFromBackingStore(uint64_t requestID, const IDBGetResult& result, uint32_t errorCode, const String& errorMessage)
</span><span class="cx"> {
</span><del>- RefPtr<AsyncRequest> request = m_pendingDatabaseTasks.take(requestID);
- ASSERT(request);
-
- request->completeRequest(result, errorCode, errorMessage);
</del><ins>+ m_pendingDatabaseTasks.take(requestID).get().completeRequest(result, errorCode, errorMessage);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::openCursorInBackingStore(uint64_t requestID, const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, IndexedDB::CursorDirection cursorDirection, IndexedDB::CursorType cursorType, IDBDatabaseBackend::TaskType taskType, const IDBKeyRangeData& keyRange)
</span><span class="lines">@@ -979,10 +970,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::didOpenCursorInBackingStore(uint64_t requestID, int64_t cursorID, const IDBKeyData& key, const IDBKeyData& primaryKey, const Vector<uint8_t>& valueBuffer, uint32_t errorCode, const String& errorMessage)
</span><span class="cx"> {
</span><del>- RefPtr<AsyncRequest> request = m_pendingDatabaseTasks.take(requestID);
- ASSERT(request);
-
- request->completeRequest(cursorID, key, primaryKey, SharedBuffer::create(valueBuffer.data(), valueBuffer.size()), errorCode, errorMessage);
</del><ins>+ m_pendingDatabaseTasks.take(requestID).get().completeRequest(cursorID, key, primaryKey, SharedBuffer::create(valueBuffer.data(), valueBuffer.size()), errorCode, errorMessage);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::advanceCursorInBackingStore(uint64_t requestID, const IDBIdentifier& cursorIdentifier, uint64_t count)
</span><span class="lines">@@ -1004,10 +992,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::didAdvanceCursorInBackingStore(uint64_t requestID, const IDBKeyData& key, const IDBKeyData& primaryKey, const Vector<uint8_t>& valueBuffer, uint32_t errorCode, const String& errorMessage)
</span><span class="cx"> {
</span><del>- RefPtr<AsyncRequest> request = m_pendingDatabaseTasks.take(requestID);
- ASSERT(request);
-
- request->completeRequest(key, primaryKey, SharedBuffer::create(valueBuffer.data(), valueBuffer.size()), errorCode, errorMessage);
</del><ins>+ m_pendingDatabaseTasks.take(requestID).get().completeRequest(key, primaryKey, SharedBuffer::create(valueBuffer.data(), valueBuffer.size()), errorCode, errorMessage);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::iterateCursorInBackingStore(uint64_t requestID, const IDBIdentifier& cursorIdentifier, const IDBKeyData& iterateKey)
</span><span class="lines">@@ -1029,10 +1014,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::didIterateCursorInBackingStore(uint64_t requestID, const IDBKeyData& key, const IDBKeyData& primaryKey, const Vector<uint8_t>& valueBuffer, uint32_t errorCode, const String& errorMessage)
</span><span class="cx"> {
</span><del>- RefPtr<AsyncRequest> request = m_pendingDatabaseTasks.take(requestID);
- ASSERT(request);
-
- request->completeRequest(key, primaryKey, SharedBuffer::create(valueBuffer.data(), valueBuffer.size()), errorCode, errorMessage);
</del><ins>+ m_pendingDatabaseTasks.take(requestID).get().completeRequest(key, primaryKey, SharedBuffer::create(valueBuffer.data(), valueBuffer.size()), errorCode, errorMessage);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::countInBackingStore(uint64_t requestID, const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, const IDBKeyRangeData& keyRangeData)
</span><span class="lines">@@ -1051,10 +1033,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::didCountInBackingStore(uint64_t requestID, int64_t count, uint32_t errorCode, const String& errorMessage)
</span><span class="cx"> {
</span><del>- RefPtr<AsyncRequest> request = m_pendingDatabaseTasks.take(requestID);
- ASSERT(request);
-
- request->completeRequest(count, errorCode, errorMessage);
</del><ins>+ m_pendingDatabaseTasks.take(requestID).get().completeRequest(count, errorCode, errorMessage);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::deleteRangeInBackingStore(uint64_t requestID, const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const IDBKeyRangeData& keyRangeData)
</span><span class="lines">@@ -1073,10 +1052,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::didDeleteRangeInBackingStore(uint64_t requestID, uint32_t errorCode, const String& errorMessage)
</span><span class="cx"> {
</span><del>- RefPtr<AsyncRequest> request = m_pendingDatabaseTasks.take(requestID);
- ASSERT(request);
-
- request->completeRequest(errorCode, errorMessage);
</del><ins>+ m_pendingDatabaseTasks.take(requestID).get().completeRequest(errorCode, errorMessage);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::didEstablishTransaction(const IDBIdentifier& transactionIdentifier, bool success)
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h (183897 => 183898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2015-05-06 23:14:14 UTC (rev 183897)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2015-05-06 23:32:59 UTC (rev 183898)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE) && ENABLE(DATABASE_PROCESS)
</span><span class="cx">
</span><ins>+#include "AsyncRequest.h"
</ins><span class="cx"> #include "IDBIdentifier.h"
</span><span class="cx"> #include "UniqueIDBDatabaseIdentifier.h"
</span><span class="cx"> #include <WebCore/IDBDatabaseBackend.h>
</span><span class="lines">@@ -48,7 +49,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-class AsyncRequest;
</del><span class="cx"> class AsyncTask;
</span><span class="cx"> class DatabaseProcessIDBConnection;
</span><span class="cx"> class UniqueIDBDatabaseBackingStore;
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> Deque<RefPtr<AsyncRequest>> m_pendingMetadataRequests;
</span><span class="cx"> HashMap<IDBIdentifier, RefPtr<AsyncRequest>> m_pendingTransactionRequests;
</span><span class="cx"> HashSet<IDBIdentifier> m_pendingTransactionRollbacks;
</span><del>- HashMap<uint64_t, RefPtr<AsyncRequest>> m_pendingDatabaseTasks;
</del><ins>+ AsyncRequestMap m_pendingDatabaseTasks;
</ins><span class="cx"> RefPtr<AsyncRequest> m_pendingShutdownTask;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<WebCore::IDBDatabaseMetadata> m_metadata;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAsyncRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/AsyncRequest.h (183897 => 183898)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/AsyncRequest.h 2015-05-06 23:14:14 UTC (rev 183897)
+++ trunk/Source/WebKit2/Shared/AsyncRequest.h 2015-05-06 23:32:59 UTC (rev 183898)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #define AsyncRequest_h
</span><span class="cx">
</span><span class="cx"> #include <functional>
</span><ins>+#include <wtf/HashMap.h>
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><span class="lines">@@ -104,6 +105,49 @@
</span><span class="cx"> m_abortHandler = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+class AsyncRequestMap {
+public:
+ AsyncRequestMap()
+#ifndef NDEBUG
+ : m_lastRequestIDTaken(std::numeric_limits<uint64_t>::max())
+#endif
+ { }
+
+ Ref<AsyncRequest> take(uint64_t requestID)
+ {
+#ifndef NDEBUG
+ ASSERT_WITH_MESSAGE(requestID != m_lastRequestIDTaken, "Attempt to take the same AsyncRequest twice in a row. A background queue might have dispatched both an error callback and a success callback?");
+ m_lastRequestIDTaken = requestID;
+#endif
+
+ RefPtr<AsyncRequest> request = m_requestMap.take(requestID);
+ RELEASE_ASSERT(request);
+
+ return adoptRef(*request.leakRef());
+ }
+
+ void add(uint64_t requestID, PassRefPtr<AsyncRequest> request)
+ {
+ m_requestMap.add(requestID, request);
+ }
+
+ void clear()
+ {
+ m_requestMap.clear();
+ }
+
+ WTF::IteratorRange<HashMap<uint64_t, RefPtr<AsyncRequest>>::iterator::Values> values()
+ {
+ return m_requestMap.values();
+ }
+
+private:
+ HashMap<uint64_t, RefPtr<AsyncRequest>> m_requestMap;
+#ifndef NDEBUG
+ uint64_t m_lastRequestIDTaken;
+#endif
+};
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // AsyncRequest_h
</span></span></pre>
</div>
</div>
</body>
</html>