<!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>[279255] 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/279255">279255</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-06-24 17:06:06 -0700 (Thu, 24 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Source/WebCore:
Crash in IDBTransaction::dispatchEvent when m_openDBRequest is null.
https://bugs.webkit.org/show_bug.cgi?id=226885

Patch by Venky Dass <yaranamavenkataramana@apple.com> on 2021-06-24
Reviewed by Sihui Liu.

Added a test to create null openDBRequest so that it can crash.

Test: storage/indexeddb/request-with-null-open-db-request.html

* Modules/indexeddb/IDBTransaction.cpp:
(WebCore::IDBTransaction::dispatchEvent):

LayoutTests:
Crash in IDBTransaction::dispatchEvent when m_openDBRequest is null.
https://bugs.webkit.org/show_bug.cgi?id=226885

Patch by Venky Dass <yaranamavenkataramana@apple.com> on 2021-06-24
Reviewed by Sihui Liu.

* storage/indexeddb/request-with-null-open-db-request-expected.txt: Added.
* storage/indexeddb/request-with-null-open-db-request.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactioncpp">trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactionh">trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstorageindexeddbrequestwithnullopendbrequestexpectedtxt">trunk/LayoutTests/storage/indexeddb/request-with-null-open-db-request-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbrequestwithnullopendbrequesthtml">trunk/LayoutTests/storage/indexeddb/request-with-null-open-db-request.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (279254 => 279255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-06-24 23:55:24 UTC (rev 279254)
+++ trunk/LayoutTests/ChangeLog 2021-06-25 00:06:06 UTC (rev 279255)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2021-06-24  Venky Dass  <yaranamavenkataramana@apple.com>
+
+        Crash in IDBTransaction::dispatchEvent when m_openDBRequest is null.
+        https://bugs.webkit.org/show_bug.cgi?id=226885
+
+        Reviewed by Sihui Liu.
+
+        * storage/indexeddb/request-with-null-open-db-request-expected.txt: Added.
+        * storage/indexeddb/request-with-null-open-db-request.html: Added.
+
</ins><span class="cx"> 2021-06-24  Jer Noble  <jer.noble@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Cocoa] Last few seconds of 'audio/webm; codecs=vorbis' appended to a SampleBuffer are not played
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbrequestwithnullopendbrequestexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/request-with-null-open-db-request-expected.txt (0 => 279255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/request-with-null-open-db-request-expected.txt                               (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/request-with-null-open-db-request-expected.txt  2021-06-25 00:06:06 UTC (rev 279255)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+WebKit should not crash.
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbrequestwithnullopendbrequesthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/request-with-null-open-db-request.html (0 => 279255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/request-with-null-open-db-request.html                               (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/request-with-null-open-db-request.html  2021-06-25 00:06:06 UTC (rev 279255)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<html>
+<head>
+<script>
+  if (window.testRunner){
+     testRunner.dumpAsText();
+     testRunner.waitUntilDone();
+  }
+
+  let request = indexedDB.open(Math.random());
+  request.onupgradeneeded = () => {
+    let db = request.result;
+    let idbObjectStore = db.createObjectStore('b');
+    let transaction = idbObjectStore.transaction;
+    transaction.dispatchEvent(new Event(''));
+    globalThis.testRunner?.notifyDone();
+  };
+</script>
+</head>
+<body>
+WebKit should not crash.
+<body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (279254 => 279255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-06-24 23:55:24 UTC (rev 279254)
+++ trunk/Source/WebCore/ChangeLog      2021-06-25 00:06:06 UTC (rev 279255)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2021-06-24  Venky Dass  <yaranamavenkataramana@apple.com>
+
+        Crash in IDBTransaction::dispatchEvent when m_openDBRequest is null. 
+        https://bugs.webkit.org/show_bug.cgi?id=226885
+
+        Reviewed by Sihui Liu.
+
+        Added a test to create null openDBRequest so that it can crash.  
+
+        Test: storage/indexeddb/request-with-null-open-db-request.html
+
+        * Modules/indexeddb/IDBTransaction.cpp:
+        (WebCore::IDBTransaction::dispatchEvent):
+
</ins><span class="cx"> 2021-06-24  Jer Noble  <jer.noble@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Cocoa] Last few seconds of 'audio/webm; codecs=vorbis' appended to a SampleBuffer are not played
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (279254 => 279255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp        2021-06-24 23:55:24 UTC (rev 279254)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp   2021-06-25 00:06:06 UTC (rev 279255)
</span><span class="lines">@@ -584,6 +584,7 @@
</span><span class="cx">     if (!scriptExecutionContext() || isContextStopped())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><ins>+    m_abortOrCommitEvent = event.ptr();
</ins><span class="cx">     queueTaskToDispatchEvent(*this, TaskSource::DatabaseAccess, WTFMove(event));
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -594,15 +595,19 @@
</span><span class="cx">     ASSERT(canCurrentThreadAccessThreadLocalData(m_database->originThread()));
</span><span class="cx">     ASSERT(scriptExecutionContext());
</span><span class="cx">     ASSERT(!isContextStopped());
</span><del>-    ASSERT(event.type() == eventNames().completeEvent || event.type() == eventNames().abortEvent);
</del><ins>+    
</ins><span class="cx"> 
</span><span class="cx">     auto protectedThis = makeRef(*this);
</span><span class="cx"> 
</span><span class="cx">     EventDispatcher::dispatchEvent({ this, m_database.ptr() }, event);
</span><ins>+    
+    if (m_abortOrCommitEvent != &event)
+        return;
+    
+    ASSERT(event.type() == eventNames().completeEvent || event.type() == eventNames().abortEvent);
</ins><span class="cx">     m_didDispatchAbortOrCommit = true;
</span><span class="cx"> 
</span><span class="cx">     if (isVersionChange()) {
</span><del>-        ASSERT(m_openDBRequest);
</del><span class="cx">         m_openDBRequest->versionChangeTransactionDidFinish();
</span><span class="cx"> 
</span><span class="cx">         if (event.type() == eventNames().completeEvent) {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h (279254 => 279255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h  2021-06-24 23:55:24 UTC (rev 279254)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h     2021-06-25 00:06:06 UTC (rev 279255)
</span><span class="lines">@@ -250,6 +250,7 @@
</span><span class="cx">     Deque<RefPtr<IDBClient::TransactionOperation>> m_pendingTransactionOperationQueue;
</span><span class="cx">     Deque<IDBClient::TransactionOperation*> m_transactionOperationsInProgressQueue;
</span><span class="cx">     Deque<RefPtr<IDBClient::TransactionOperation>> m_abortQueue;
</span><ins>+    Event* m_abortOrCommitEvent;
</ins><span class="cx">     HashMap<RefPtr<IDBClient::TransactionOperation>, IDBResultData> m_transactionOperationResultMap;
</span><span class="cx"> 
</span><span class="cx">     HashMap<IDBResourceIdentifier, RefPtr<IDBClient::TransactionOperation>> m_transactionOperationMap;
</span></span></pre>
</div>
</div>

</body>
</html>