Commit 3d4375e6 authored by Simon Giesecke's avatar Simon Giesecke
Browse files

Bug 1617170 - Deserialize Blob only when it is used in... 

Bug 1617170 - Deserialize Blob only when it is used in AllocPBackgroundIDBDatabaseFileParent. r=janv

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

--HG--
extra : moz-landing-system : lando
parent 57cac529

dom/indexedDB/ActorsParent.cpp

+3 −6
Original line number Diff line number Diff line
@@ -6254,8 +6254,8 @@ class DatabaseFile final : public PBackgroundIDBDatabaseFileParent { 
  }









  // Called when receiving from the child.









  DatabaseFile(BlobImpl* aBlobImpl, FileInfo* aFileInfo)









      : mBlobImpl(aBlobImpl), mFileInfo(aFileInfo) {









  DatabaseFile(RefPtr<BlobImpl> aBlobImpl, FileInfo* aFileInfo)









      : mBlobImpl(std::move(aBlobImpl)), mFileInfo(aFileInfo) {









    AssertIsOnBackgroundThread();









    MOZ_ASSERT(*mBlobImpl);









    MOZ_ASSERT(mFileInfo);








@@ -14102,9 +14102,6 @@ PBackgroundIDBDatabaseFileParent*







Database::AllocPBackgroundIDBDatabaseFileParent(const IPCBlob& aIPCBlob) {









  AssertIsOnBackgroundThread();

















  RefPtr<BlobImpl> blobImpl = IPCBlobUtils::Deserialize(aIPCBlob);









  MOZ_ASSERT(blobImpl);

















  RefPtr<FileInfo> fileInfo = GetBlob(aIPCBlob);









  RefPtr<DatabaseFile> actor;
















@@ -14115,7 +14112,7 @@ Database::AllocPBackgroundIDBDatabaseFileParent(const IPCBlob& aIPCBlob) {







    fileInfo = mFileManager->CreateFileInfo();









    MOZ_ASSERT(fileInfo);

















    actor = new DatabaseFile(blobImpl, fileInfo);









    actor = new DatabaseFile(IPCBlobUtils::Deserialize(aIPCBlob), fileInfo);









  }

















  MOZ_ASSERT(actor);