Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-27 12:15:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1343863 - Make sure that places Database object doesn't get leaked if the profile folder doesn't exist or is locked; r=mak

Browse Source
This commit is contained in:
Ehsan Akhgari 2017-03-02 09:28:24 -05:00
parent 2d58b7e9f1
commit eb8235f7ab
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
toolkit/components/places/Database.cpp
View File

@ -5,6 +5,7 @@
#include "mozilla/ArrayUtils.h"
#include "mozilla/Attributes.h"
#include "mozilla/DebugOnly.h"
#include "mozilla/ScopeExit.h"
#include "Database.h"
@ -433,6 +434,16 @@ Database::Init()
{
MOZ_ASSERT(NS_IsMainThread());
bool initSucceeded = false;
auto guard = MakeScopeExit([&]() {
if (!initSucceeded) {
// If we bail out early here without doing anything else, the Database object
// will leak due to the cycle between the shutdown blockers and itself, so
// let's break the cycle first.
Shutdown();
}
});
nsCOMPtr<mozIStorageService> storage =
do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID);
NS_ENSURE_STATE(storage);
@ -497,6 +508,7 @@ Database::Init()
// At this point we know the Database object points to a valid connection
// and we need to setup async shutdown.
initSucceeded = true;
{
// First of all Places clients should block profile-change-teardown.
nsCOMPtr<nsIAsyncShutdownClient> shutdownPhase = GetProfileChangeTeardownPhase();