Bug 855276: Moar diagnostics.

docfaraday · Apr 9, 2013 · 59dacf8 · 59dacf8
1 parent c0a9f0f
commit 59dacf8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/dom/indexedDB/Client.cpp b/dom/indexedDB/Client.cpp
@@ -193,7 +193,9 @@ Client::WaitForStoragesToComplete(nsTArray<nsIOfflineStorage*>& aStorages,
   nsTArray<IDBDatabase*> databases(aStorages.Length());
   for (uint32_t index = 0; index < aStorages.Length(); index++) {
     IDBDatabase* database = IDBDatabase::FromStorage(aStorages[index]);
-    NS_ASSERTION(database, "This shouldn't be null!");
+    if (!database) {
+      MOZ_CRASH();
+    }
 
     databases.AppendElement(database);
   }

diff --git a/dom/indexedDB/TransactionThreadPool.cpp b/dom/indexedDB/TransactionThreadPool.cpp
@@ -469,7 +469,12 @@ TransactionThreadPool::MaybeFireCallback(DatabasesCompleteCallback& aCallback)
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 
   for (uint32_t index = 0; index < aCallback.mDatabases.Length(); index++) {
-    if (mTransactionsInProgress.Get(aCallback.mDatabases[index]->Id(),
+    IDBDatabase* database = aCallback.mDatabases[index];
+    if (!database) {
+      MOZ_CRASH();
+    }
+
+    if (mTransactionsInProgress.Get(database->Id(),
                                     nullptr)) {
       return false;
     }