Changeset 85046 in webkit

Timestamp:

Apr 27, 2011 4:45:23 AM (13 years ago)

Author:

hans@chromium.org

Message:

2011-04-27 Hans Wennborg <​hans@chromium.org>

Reviewed by Tony Gentilcore.

IndexedDB: Fix compiler warnings about uninitialized variables
​https://bugs.webkit.org/show_bug.cgi?id=59599

Build fix. No new tests.

• storage/IDBLevelDBBackingStore.cpp: (WebCore::getNewObjectStoreId): (WebCore::getNewIndexId):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• storage/IDBLevelDBBackingStore.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-27  Hans Wennborg  <hans@chromium.org>
+
+        Reviewed by Tony Gentilcore.
+
+        IndexedDB: Fix compiler warnings about uninitialized variables
+        https://bugs.webkit.org/show_bug.cgi?id=59599
+
+        Build fix. No new tests.
+
+        * storage/IDBLevelDBBackingStore.cpp:
+        (WebCore::getNewObjectStoreId):
+        (WebCore::getNewIndexId):
+
 2011-04-26  Hans Wennborg  <hans@chromium.org>
 

trunk/Source/WebCore/storage/IDBLevelDBBackingStore.cpp

@@ -304 +304 @@
     }
 
-    int64_t maxObjectStoreId;
+    int64_t maxObjectStoreId = -1;
     const Vector<char> maxObjectStoreIdKey = DatabaseMetaDataKey::encode(databaseId, DatabaseMetaDataKey::kMaxObjectStoreId);
     if (!getInt(db, maxObjectStoreIdKey, maxObjectStoreId))
         maxObjectStoreId = 0;
+
+    ASSERT(maxObjectStoreId >= 0);
 
     int64_t objectStoreId = maxObjectStoreId + 1;
@@ -642 +644 @@
     }
 
-    int64_t maxIndexId;
+    int64_t maxIndexId = -1;
     const Vector<char> maxIndexIdKey = ObjectStoreMetaDataKey::encode(databaseId, objectStoreId, 5);
     if (!getInt(db, maxIndexIdKey, maxIndexId))
         maxIndexId = kMinimumIndexId;
+
+    ASSERT(maxIndexId >= 0);
 
     int64_t indexId = maxIndexId + 1;