Changeset 127685 in webkit

Timestamp:

Sep 5, 2012 8:54:06 PM (12 years ago)

Author:

jsbell@chromium.org

Message:

IndexedDB: Large integer versions not persisted correctly
​https://bugs.webkit.org/show_bug.cgi?id=95873

Reviewed by Tony Chang.

Source/WebCore:

Correctly encode AND decode integer versions numbers as VarInts.

Test: storage/indexeddb/intversion-encoding.html

• Modules/indexeddb/IDBLevelDBBackingStore.cpp:

(WebCore::getVarInt):
(WebCore):
(WebCore::IDBLevelDBBackingStore::getIDBDatabaseMetaData):

LayoutTests:

Verify large integer versions that encode differently as Ints vs. VarInts.

• storage/indexeddb/intversion-encoding-expected.txt: Added.
• storage/indexeddb/intversion-encoding.html: Added.
• storage/indexeddb/resources/intversion-encoding.js: Added.

(test):
(openFirstTime.request.onupgradeneeded):
(openFirstTime.request.onsuccess):
(openFirstTime):
(openSecondTime.request.onsuccess):
(openSecondTime):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/storage/indexeddb/intversion-encoding-expected.txt (added)
• LayoutTests/storage/indexeddb/intversion-encoding.html (added)
• LayoutTests/storage/indexeddb/resources/intversion-encoding.js (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-05  Joshua Bell  <jsbell@chromium.org>
+
+        IndexedDB: Large integer versions not persisted correctly
+        https://bugs.webkit.org/show_bug.cgi?id=95873
+
+        Reviewed by Tony Chang.
+
+        Verify large integer versions that encode differently as Ints vs. VarInts.
+
+        * storage/indexeddb/intversion-encoding-expected.txt: Added.
+        * storage/indexeddb/intversion-encoding.html: Added.
+        * storage/indexeddb/resources/intversion-encoding.js: Added.
+        (test):
+        (openFirstTime.request.onupgradeneeded):
+        (openFirstTime.request.onsuccess):
+        (openFirstTime):
+        (openSecondTime.request.onsuccess):
+        (openSecondTime):
+
 2012-09-05  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-05  Joshua Bell  <jsbell@chromium.org>
+
+        IndexedDB: Large integer versions not persisted correctly
+        https://bugs.webkit.org/show_bug.cgi?id=95873
+
+        Reviewed by Tony Chang.
+
+        Correctly encode AND decode integer versions numbers as VarInts.
+
+        Test: storage/indexeddb/intversion-encoding.html
+
+        * Modules/indexeddb/IDBLevelDBBackingStore.cpp:
+        (WebCore::getVarInt):
+        (WebCore):
+        (WebCore::IDBLevelDBBackingStore::getIDBDatabaseMetaData):
+
 2012-09-05  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp

@@ -89 +89 @@
 
 template <typename DBOrTransaction>
+static bool getVarInt(DBOrTransaction* db, const Vector<char>& key, int64_t& foundInt)
+{
+    Vector<char> result;
+    if (!db->get(key, result))
+        return false;
+
+    return decodeVarInt(result.begin(), result.end(), foundInt) == result.end();
+}
+
+template <typename DBOrTransaction>
 static bool putVarInt(DBOrTransaction* db, const Vector<char>& key, int64_t value)
 {
@@ -285 +295 @@
         return false;
 
-    ok = getInt(m_db.get(), DatabaseMetaDataKey::encode(foundId, DatabaseMetaDataKey::UserIntVersion), foundIntVersion);
+    ok = getVarInt(m_db.get(), DatabaseMetaDataKey::encode(foundId, DatabaseMetaDataKey::UserIntVersion), foundIntVersion);
     if (!ok)
         return false;