<!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>[214375] 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/214375">214375</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2017-03-24 14:13:40 -0700 (Fri, 24 Mar 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>A null compound index value crashes the Databases process.
&lt;rdar://problem/30499831&gt; and https://bugs.webkit.org/show_bug.cgi?id=170000

Reviewed by Alex Christensen.

Source/WebCore:

Test: storage/indexeddb/modern/single-entry-index-invalid-key-crash.html

* bindings/js/IDBBindingUtilities.cpp:
(WebCore::createKeyPathArray): Fix the bug by rejecting arrays with any invalid keys in them.

Add some logging:
* Modules/indexeddb/IDBKeyPath.cpp:
(WebCore::loggingString):
* Modules/indexeddb/IDBKeyPath.h:
* Modules/indexeddb/IDBObjectStore.cpp:
(WebCore::IDBObjectStore::createIndex):
* Modules/indexeddb/shared/IDBIndexInfo.cpp:
(WebCore::IDBIndexInfo::loggingString):

LayoutTests:

* storage/indexeddb/modern/resources/single-entry-index-invalid-key-crash.js: Added.
* storage/indexeddb/modern/single-entry-index-invalid-key-crash-expected.txt: Added.
* storage/indexeddb/modern/single-entry-index-invalid-key-crash-private-expected.txt: Added.
* storage/indexeddb/modern/single-entry-index-invalid-key-crash-private.html: Added.
* storage/indexeddb/modern/single-entry-index-invalid-key-crash.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="#trunkSourceWebCoreModulesindexeddbIDBKeyPathcpp">trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBKeyPathh">trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBObjectStorecpp">trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbsharedIDBIndexInfocpp">trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsIDBBindingUtilitiescpp">trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernresourcessingleentryindexinvalidkeycrashjs">trunk/LayoutTests/storage/indexeddb/modern/resources/single-entry-index-invalid-key-crash.js</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernsingleentryindexinvalidkeycrashexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/single-entry-index-invalid-key-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernsingleentryindexinvalidkeycrashprivateexpectedtxt">trunk/LayoutTests/storage/indexeddb/modern/single-entry-index-invalid-key-crash-private-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernsingleentryindexinvalidkeycrashprivatehtml">trunk/LayoutTests/storage/indexeddb/modern/single-entry-index-invalid-key-crash-private.html</a></li>
<li><a href="#trunkLayoutTestsstorageindexeddbmodernsingleentryindexinvalidkeycrashhtml">trunk/LayoutTests/storage/indexeddb/modern/single-entry-index-invalid-key-crash.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214374 => 214375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2017-03-24 20:56:45 UTC (rev 214374)
+++ trunk/LayoutTests/ChangeLog        2017-03-24 21:13:40 UTC (rev 214375)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-03-24  Brady Eidson  &lt;beidson@apple.com&gt;
+
+        A null compound index value crashes the Databases process.
+        &lt;rdar://problem/30499831&gt; and https://bugs.webkit.org/show_bug.cgi?id=170000
+
+        Reviewed by Alex Christensen.
+
+        * storage/indexeddb/modern/resources/single-entry-index-invalid-key-crash.js: Added.
+        * storage/indexeddb/modern/single-entry-index-invalid-key-crash-expected.txt: Added.
+        * storage/indexeddb/modern/single-entry-index-invalid-key-crash-private-expected.txt: Added.
+        * storage/indexeddb/modern/single-entry-index-invalid-key-crash-private.html: Added.
+        * storage/indexeddb/modern/single-entry-index-invalid-key-crash.html: Added.
+
</ins><span class="cx"> 2017-03-24  Ryan Haddad  &lt;ryanhaddad@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Skip svg/animations/animations-paused-when-inserted-in-hidden-document* tests on ios-simulator.
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernresourcessingleentryindexinvalidkeycrashjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/resources/single-entry-index-invalid-key-crash.js (0 => 214375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/resources/single-entry-index-invalid-key-crash.js                                (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/resources/single-entry-index-invalid-key-crash.js        2017-03-24 21:13:40 UTC (rev 214375)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+description(&quot;Tests that adding to an object store, with a single-entry Index, where the index key is an array that is not entirely valid... does not crash.&quot;);
+
+indexedDBTest(prepareDatabase);
+
+function log(message)
+{
+    debug(message);
+}
+
+function prepareDatabase(event)
+{
+    db = event.target.result;
+    os = db.createObjectStore(&quot;friends&quot;, { keyPath: &quot;id&quot;, autoIncrement: true });
+        idx = os.createIndex(&quot;[age+shoeSize]&quot;, [&quot;age&quot;, &quot;shoeSize&quot;]);
+        os.add({ name: &quot;Mark&quot;, age: 29, shoeSize: null });
+
+        idx.openCursor().onsuccess = function(event) {
+            if (event.target.result)
+                log(&quot;Index unexpectedly has an entry&quot;);
+        else
+                log(&quot;Index has no entries&quot;);
+    };
+        
+    event.target.transaction.oncomplete = function() {
+        finishJSTest();
+    };
+}
+

</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernsingleentryindexinvalidkeycrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/single-entry-index-invalid-key-crash-expected.txt (0 => 214375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/single-entry-index-invalid-key-crash-expected.txt                                (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/single-entry-index-invalid-key-crash-expected.txt        2017-03-24 21:13:40 UTC (rev 214375)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+Tests that adding to an object store, with a single-entry Index, where the index key is an array that is not entirely valid... does not crash.
+
+On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
+
+
+indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
+
+indexedDB.deleteDatabase(dbname)
+indexedDB.open(dbname)
+Index has no entries
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernsingleentryindexinvalidkeycrashprivateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/single-entry-index-invalid-key-crash-private-expected.txt (0 => 214375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/single-entry-index-invalid-key-crash-private-expected.txt                                (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/single-entry-index-invalid-key-crash-private-expected.txt        2017-03-24 21:13:40 UTC (rev 214375)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+Tests that adding to an object store, with a single-entry Index, where the index key is an array that is not entirely valid... does not crash.
+
+On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
+
+
+indexedDB = self.indexedDB || self.webkitIndexedDB || self.mozIndexedDB || self.msIndexedDB || self.OIndexedDB;
+
+indexedDB.deleteDatabase(dbname)
+indexedDB.open(dbname)
+Index has no entries
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernsingleentryindexinvalidkeycrashprivatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/single-entry-index-invalid-key-crash-private.html (0 => 214375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/single-entry-index-invalid-key-crash-private.html                                (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/single-entry-index-invalid-key-crash-private.html        2017-03-24 21:13:40 UTC (rev 214375)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+&lt;html&gt;
+&lt;head&gt;
+&lt;script src=&quot;../../../resources/js-test.js&quot;&gt;&lt;/script&gt;
+&lt;script src=&quot;../resources/shared.js&quot;&gt;&lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+
+&lt;script src=&quot;resources/single-entry-index-invalid-key-crash.js&quot;&gt;&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsstorageindexeddbmodernsingleentryindexinvalidkeycrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/indexeddb/modern/single-entry-index-invalid-key-crash.html (0 => 214375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/indexeddb/modern/single-entry-index-invalid-key-crash.html                                (rev 0)
+++ trunk/LayoutTests/storage/indexeddb/modern/single-entry-index-invalid-key-crash.html        2017-03-24 21:13:40 UTC (rev 214375)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+&lt;html&gt;
+&lt;head&gt;
+&lt;script src=&quot;../../../resources/js-test.js&quot;&gt;&lt;/script&gt;
+&lt;script src=&quot;../resources/shared.js&quot;&gt;&lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+
+&lt;script src=&quot;resources/single-entry-index-invalid-key-crash.js&quot;&gt;&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214374 => 214375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2017-03-24 20:56:45 UTC (rev 214374)
+++ trunk/Source/WebCore/ChangeLog        2017-03-24 21:13:40 UTC (rev 214375)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-03-24  Brady Eidson  &lt;beidson@apple.com&gt;
+
+        A null compound index value crashes the Databases process.
+        &lt;rdar://problem/30499831&gt; and https://bugs.webkit.org/show_bug.cgi?id=170000
+
+        Reviewed by Alex Christensen.
+
+        Test: storage/indexeddb/modern/single-entry-index-invalid-key-crash.html
+
+        * bindings/js/IDBBindingUtilities.cpp:
+        (WebCore::createKeyPathArray): Fix the bug by rejecting arrays with any invalid keys in them.
+        
+        Add some logging:
+        * Modules/indexeddb/IDBKeyPath.cpp:
+        (WebCore::loggingString):
+        * Modules/indexeddb/IDBKeyPath.h:
+        * Modules/indexeddb/IDBObjectStore.cpp:
+        (WebCore::IDBObjectStore::createIndex):
+        * Modules/indexeddb/shared/IDBIndexInfo.cpp:
+        (WebCore::IDBIndexInfo::loggingString):
+
</ins><span class="cx"> 2017-03-24  Ryan Haddad  &lt;ryanhaddad@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, rolling out r214360.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyPathcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp (214374 => 214375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp        2017-03-24 20:56:45 UTC (rev 214374)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.cpp        2017-03-24 21:13:40 UTC (rev 214375)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx">  * Copyright (C) 2010 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -30,6 +31,7 @@
</span><span class="cx"> 
</span><span class="cx"> #include &lt;wtf/ASCIICType.h&gt;
</span><span class="cx"> #include &lt;wtf/dtoa.h&gt;
</span><ins>+#include &lt;wtf/text/StringBuilder.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="lines">@@ -221,6 +223,31 @@
</span><span class="cx">     return WTF::visit(visitor, keyPath);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#ifndef NDEBUG
+String loggingString(const IDBKeyPath&amp; path)
+{
+    auto visitor = WTF::makeVisitor([](const String&amp; string) {
+        return makeString(&quot;&lt; &quot;, string, &quot; &gt;&quot;);
+    }, [](const Vector&lt;String&gt;&amp; strings) {
+        if (strings.isEmpty())
+            return String(&quot;&lt; &gt;&quot;);
+
+        StringBuilder builder;
+        builder.append(&quot;&lt; &quot;);
+        for (size_t i = 0; i &lt; strings.size() - 1; ++i) {
+            builder.append(strings[i]);
+            builder.append(&quot;, &quot;);
+        }
+        builder.append(strings.last());
+        builder.append(&quot; &gt;&quot;);
+
+        return builder.toString();
+    });
+
+    return WTF::visit(visitor, path);
+}
+#endif
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBKeyPathh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h (214374 => 214375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h        2017-03-24 20:56:45 UTC (rev 214374)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBKeyPath.h        2017-03-24 21:13:40 UTC (rev 214375)
</span><span class="lines">@@ -1,5 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx">  * Copyright (C) 2010 Google Inc. All rights reserved.
</span><ins>+ * Copyright (C) 2016-2017 Apple Inc. All rights reserved.
</ins><span class="cx">  *
</span><span class="cx">  * Redistribution and use in source and binary forms, with or without
</span><span class="cx">  * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -52,6 +53,10 @@
</span><span class="cx">     return isolatedCopy(variant.value());
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#ifndef NDEBUG
+String loggingString(const IDBKeyPath&amp;);
+#endif
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBObjectStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp (214374 => 214375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp        2017-03-24 20:56:45 UTC (rev 214374)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp        2017-03-24 21:13:40 UTC (rev 214375)
</span><span class="lines">@@ -424,7 +424,7 @@
</span><span class="cx"> 
</span><span class="cx"> ExceptionOr&lt;Ref&lt;IDBIndex&gt;&gt; IDBObjectStore::createIndex(ExecState&amp;, const String&amp; name, IDBKeyPath&amp;&amp; keyPath, const IndexParameters&amp; parameters)
</span><span class="cx"> {
</span><del>-    LOG(IndexedDB, &quot;IDBObjectStore::createIndex %s&quot;, name.utf8().data());
</del><ins>+    LOG(IndexedDB, &quot;IDBObjectStore::createIndex %s (keyPath: %s, unique: %i, multiEntry: %i)&quot;, name.utf8().data(), loggingString(keyPath).utf8().data(), parameters.unique, parameters.multiEntry);
</ins><span class="cx">     ASSERT(currentThread() == m_transaction.database().originThreadID());
</span><span class="cx"> 
</span><span class="cx">     if (!m_transaction.isVersionChange())
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbsharedIDBIndexInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.cpp (214374 => 214375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.cpp        2017-03-24 20:56:45 UTC (rev 214374)
+++ trunk/Source/WebCore/Modules/indexeddb/shared/IDBIndexInfo.cpp        2017-03-24 21:13:40 UTC (rev 214375)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">     for (int i = 0; i &lt; indent; ++i)
</span><span class="cx">         indentString.append(&quot; &quot;);
</span><span class="cx"> 
</span><del>-    return makeString(indentString, &quot;Index: &quot;, m_name, String::format(&quot; (%&quot; PRIu64 &quot;) \n&quot;, m_identifier));
</del><ins>+    return makeString(indentString, &quot;Index: &quot;, m_name, String::format(&quot; (%&quot; PRIu64 &quot;) keyPath: %s\n&quot;, m_identifier, WebCore::loggingString(m_keyPath).utf8().data()));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> String IDBIndexInfo::condensedLoggingString() const
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsIDBBindingUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp (214374 => 214375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp        2017-03-24 20:56:45 UTC (rev 214374)
+++ trunk/Source/WebCore/bindings/js/IDBBindingUtilities.cpp        2017-03-24 21:13:40 UTC (rev 214375)
</span><span class="lines">@@ -393,7 +393,7 @@
</span><span class="cx">         Vector&lt;IDBKeyData&gt; keys;
</span><span class="cx">         for (auto&amp; entry : vector) {
</span><span class="cx">             auto key = internalCreateIDBKeyFromScriptValueAndKeyPath(exec, value, entry);
</span><del>-            if (!key)
</del><ins>+            if (!key || !key-&gt;isValid())
</ins><span class="cx">                 return { };
</span><span class="cx">             keys.append(key.get());
</span><span class="cx">         }
</span></span></pre>
</div>
</div>

</body>
</html>