Bug 1708705 - Check new requests are rejected during structured cloni…

…ng. r=dom-storage-reviewers,janv

The check is restored from the previous implementation.

Differential Revision: https://phabricator.services.mozilla.com/D137031

dom/indexedDB/IDBObjectStore.cpp

@@ -777,13 +777,24 @@ RefPtr<IDBRequest> IDBObjectStore::AddOrPut(JSContext* aCx,
   // According to spec https://w3c.github.io/IndexedDB/#clone-value,
   // the transaction must be in inactive state during clone
   mTransaction->TransitionToInactive();
+
+#ifdef DEBUG
+  const uint32_t previousPendingRequestCount{
+      mTransaction->GetPendingRequestCount()};
+#endif
   GetAddInfo(aCx, aValueWrapper, aKey, cloneWriteInfo, key, updateInfos, aRv);
-  if (mTransaction
-          ->IsAborted()) {  // No error thrown, abort is a possible outcome
-    return nullptr;
+  // Check that new requests were rejected in the Inactive state
+  // and possibly in the Finished state, if the transaction has been aborted,
+  // during the structured cloning.
+  MOZ_ASSERT(mTransaction->GetPendingRequestCount() ==
+             previousPendingRequestCount);
+
+  if (!mTransaction->IsAborted()) {
+    mTransaction->TransitionToActive();
+  } else if (!aRv.Failed()) {
+    aRv.Throw(NS_ERROR_DOM_INDEXEDDB_ABORT_ERR);
+    return nullptr;  // It is mandatory to return right after throw
   }
-  MOZ_ASSERT(mTransaction->IsInactive());
-  mTransaction->TransitionToActive();
 
   if (aRv.Failed()) {
     return nullptr;

dom/indexedDB/IDBTransaction.h

@@ -232,6 +232,8 @@ class IDBTransaction final
     return mMode;
   }
 
+  uint32_t GetPendingRequestCount() const { return mPendingRequestCount; }
+
   IDBDatabase* Database() const {
     AssertIsOnOwningThread();
     return mDatabase;