<!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>[247159] trunk/Source/WebCore</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/247159">247159</a></dd>
<dt>Author</dt> <dd>youenn@apple.com</dd>
<dt>Date</dt> <dd>2019-07-05 09:24:26 -0700 (Fri, 05 Jul 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>ASSERT that a sessionID is valid when encoding it
https://bugs.webkit.org/show_bug.cgi?id=199302

Reviewed by Darin Adler.

Source/WebCore:

For IDBValue, instead of encoding an invalid session ID, encode a boolean that tells there is no sessionID.
For IDBRequestData, keep track of whether there is an IDBDatabaseIdentifier
and encode/decode accordingly to not encode an invalid sessionID.
No observable change of behavior.

* Modules/indexeddb/IDBValue.h:
(WebCore::IDBValue::sessionID const):
(WebCore::IDBValue::encode const):
(WebCore::IDBValue::decode):
* Modules/indexeddb/shared/IDBRequestData.cpp:
(WebCore::IDBRequestData::isolatedCopy):
* Modules/indexeddb/shared/IDBRequestData.h:
(WebCore::IDBRequestData::databaseIdentifier const):
(WebCore::IDBRequestData::decode):

Source/WebCore/PAL:

ASSERT that a sessionID is valid at encoding/decoding time.

* pal/SessionID.h:
(PAL::SessionID::encode const):
(PAL::SessionID::decode):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBValueh">trunk/Source/WebCore/Modules/indexeddb/IDBValue.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBRequestDatacpp">trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBRequestDatah">trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.h</a></li>
<li><a href="#trunkSourceWebCorePALChangeLog">trunk/Source/WebCore/PAL/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePALpalSessionIDh">trunk/Source/WebCore/PAL/pal/SessionID.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (247158 => 247159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-07-05 16:22:42 UTC (rev 247158)
+++ trunk/Source/WebCore/ChangeLog      2019-07-05 16:24:26 UTC (rev 247159)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2019-07-05  Youenn Fablet  <youenn@apple.com>
+
+        ASSERT that a sessionID is valid when encoding it
+        https://bugs.webkit.org/show_bug.cgi?id=199302
+
+        Reviewed by Darin Adler.
+
+        For IDBValue, instead of encoding an invalid session ID, encode a boolean that tells there is no sessionID.
+        For IDBRequestData, keep track of whether there is an IDBDatabaseIdentifier
+        and encode/decode accordingly to not encode an invalid sessionID.
+        No observable change of behavior.
+
+        * Modules/indexeddb/IDBValue.h:
+        (WebCore::IDBValue::sessionID const):
+        (WebCore::IDBValue::encode const):
+        (WebCore::IDBValue::decode):
+        * Modules/indexeddb/shared/IDBRequestData.cpp:
+        (WebCore::IDBRequestData::isolatedCopy):
+        * Modules/indexeddb/shared/IDBRequestData.h:
+        (WebCore::IDBRequestData::databaseIdentifier const):
+        (WebCore::IDBRequestData::decode):
+
</ins><span class="cx"> 2019-07-05  Zalan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [LFC][IFC] Inline runs should be relative to the line's top/left initially
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBValue.h (247158 => 247159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBValue.h        2019-07-05 16:22:42 UTC (rev 247158)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBValue.h   2019-07-05 16:24:26 UTC (rev 247159)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> 
</span><span class="cx">     const ThreadSafeDataBuffer& data() const { return m_data; }
</span><span class="cx">     const Vector<String>& blobURLs() const { return m_blobURLs; }
</span><del>-    const PAL::SessionID& sessionID() const { return m_sessionID; }
</del><ins>+    const PAL::SessionID& sessionID() const;
</ins><span class="cx">     const Vector<String>& blobFilePaths() const { return m_blobFilePaths; }
</span><span class="cx"> 
</span><span class="cx">     template<class Encoder> void encode(Encoder&) const;
</span><span class="lines">@@ -59,10 +59,17 @@
</span><span class="cx"> private:
</span><span class="cx">     ThreadSafeDataBuffer m_data;
</span><span class="cx">     Vector<String> m_blobURLs;
</span><del>-    PAL::SessionID m_sessionID;
</del><ins>+    mutable Optional<PAL::SessionID> m_sessionID;
</ins><span class="cx">     Vector<String> m_blobFilePaths;
</span><span class="cx"> };
</span><span class="cx"> 
</span><ins>+inline const PAL::SessionID& IDBValue::sessionID() const
+{
+    // FIXME: We should assert m_sessionID is valid or remove m_sessionID.
+    if (!m_sessionID)
+        m_sessionID = PAL::SessionID { };
+    return *m_sessionID;
+}
</ins><span class="cx"> 
</span><span class="cx"> template<class Encoder>
</span><span class="cx"> void IDBValue::encode(Encoder& encoder) const
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBRequestDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.cpp (247158 => 247159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.cpp 2019-07-05 16:22:42 UTC (rev 247158)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.cpp    2019-07-05 16:24:26 UTC (rev 247159)
</span><span class="lines">@@ -98,7 +98,8 @@
</span><span class="cx">     destination.m_requestedVersion = source.m_requestedVersion;
</span><span class="cx">     destination.m_requestType = source.m_requestType;
</span><span class="cx"> 
</span><del>-    destination.m_databaseIdentifier = source.m_databaseIdentifier.isolatedCopy();
</del><ins>+    if (source.m_databaseIdentifier)
+        destination.m_databaseIdentifier = source.m_databaseIdentifier->isolatedCopy();
</ins><span class="cx"> 
</span><span class="cx">     if (source.m_requestIdentifier)
</span><span class="cx">         destination.m_requestIdentifier = std::make_unique<IDBResourceIdentifier>(*source.m_requestIdentifier);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBRequestDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.h (247158 => 247159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.h   2019-07-05 16:22:42 UTC (rev 247158)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBRequestData.h      2019-07-05 16:24:26 UTC (rev 247159)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">     IndexedDB::IndexRecordType indexRecordType() const;
</span><span class="cx">     IDBResourceIdentifier cursorIdentifier() const;
</span><span class="cx"> 
</span><del>-    const IDBDatabaseIdentifier& databaseIdentifier() const { return m_databaseIdentifier; }
</del><ins>+    const IDBDatabaseIdentifier& databaseIdentifier() const;
</ins><span class="cx">     uint64_t requestedVersion() const;
</span><span class="cx"> 
</span><span class="cx">     bool isOpenRequest() const { return m_requestType == IndexedDB::RequestType::Open; }
</span><span class="lines">@@ -89,12 +89,20 @@
</span><span class="cx">     uint64_t m_indexIdentifier { 0 };
</span><span class="cx">     IndexedDB::IndexRecordType m_indexRecordType;
</span><span class="cx"> 
</span><del>-    IDBDatabaseIdentifier m_databaseIdentifier;
</del><ins>+    mutable Optional<IDBDatabaseIdentifier> m_databaseIdentifier;
</ins><span class="cx">     uint64_t m_requestedVersion { 0 };
</span><span class="cx"> 
</span><span class="cx">     IndexedDB::RequestType m_requestType { IndexedDB::RequestType::Other };
</span><span class="cx"> };
</span><span class="cx"> 
</span><ins>+inline const IDBDatabaseIdentifier& IDBRequestData::databaseIdentifier() const
+{
+    ASSERT(m_databaseIdentifier);
+    if (!m_databaseIdentifier)
+        m_databaseIdentifier = IDBDatabaseIdentifier { };
+    return *m_databaseIdentifier;
+}
+
</ins><span class="cx"> template<class Encoder>
</span><span class="cx"> void IDBRequestData::encode(Encoder& encoder) const
</span><span class="cx"> {
</span><span class="lines">@@ -128,7 +136,7 @@
</span><span class="cx">     if (!decoder.decode(request.m_indexIdentifier))
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><del>-    Optional<IDBDatabaseIdentifier> databaseIdentifier;
</del><ins>+    Optional<Optional<IDBDatabaseIdentifier>> databaseIdentifier;
</ins><span class="cx">     decoder >> databaseIdentifier;
</span><span class="cx">     if (!databaseIdentifier)
</span><span class="cx">         return false;
</span></span></pre></div>
<a id="trunkSourceWebCorePALChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/ChangeLog (247158 => 247159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/ChangeLog       2019-07-05 16:22:42 UTC (rev 247158)
+++ trunk/Source/WebCore/PAL/ChangeLog  2019-07-05 16:24:26 UTC (rev 247159)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2019-07-05  Youenn Fablet  <youenn@apple.com>
+
+        ASSERT that a sessionID is valid when encoding it
+        https://bugs.webkit.org/show_bug.cgi?id=199302
+
+        Reviewed by Darin Adler.
+
+        ASSERT that a sessionID is valid at encoding/decoding time.
+
+        * pal/SessionID.h:
+        (PAL::SessionID::encode const):
+        (PAL::SessionID::decode):
+
</ins><span class="cx"> 2019-07-03  Jonathan Bedard  <jbedard@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [Catalina] Enable WebKit build
</span></span></pre></div>
<a id="trunkSourceWebCorePALpalSessionIDh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PAL/pal/SessionID.h (247158 => 247159)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PAL/pal/SessionID.h 2019-07-05 16:22:42 UTC (rev 247158)
+++ trunk/Source/WebCore/PAL/pal/SessionID.h    2019-07-05 16:24:26 UTC (rev 247159)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> template<class Encoder>
</span><span class="cx"> void SessionID::encode(Encoder& encoder) const
</span><span class="cx"> {
</span><del>-    // FIXME: Eliminate places that encode invalid SessionIDs, then ASSERT here that the sessionID is valid.
</del><ins>+    ASSERT(isValid());
</ins><span class="cx">     encoder << m_sessionID;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -104,7 +104,8 @@
</span><span class="cx">     if (!sessionID)
</span><span class="cx">         return WTF::nullopt;
</span><span class="cx"> 
</span><del>-    // FIXME: Eliminate places that encode invalid SessionIDs, then fail to decode an invalid sessionID.
</del><ins>+    // FIXME: We should fail to decode an invalid sessionID.
+    ASSERT(SessionID { *sessionID }.isValid());
</ins><span class="cx">     return SessionID { *sessionID };
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>