зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1275518 - Add null pointer check before accessing DatabaseInfo::mConnection. r=janv
--HG-- extra : rebase_source : 725bc0d4229624de7078195ffb56c7dfc49bbab3
This commit is contained in:
Родитель
13b75c9133
Коммит
f3cc098cd9
|
@ -12636,13 +12636,17 @@ IdleConnectionRunnable::Run()
|
|||
|
||||
if (owningThread) {
|
||||
mDatabaseInfo->AssertIsOnConnectionThread();
|
||||
MOZ_ASSERT(mDatabaseInfo->mConnection);
|
||||
|
||||
// The connection could be null if EnsureConnection() didn't run or was not
|
||||
// successful in TransactionDatabaseOperationBase::RunOnConnectionThread().
|
||||
if (mDatabaseInfo->mConnection) {
|
||||
mDatabaseInfo->mConnection->DoIdleProcessing(mNeedsCheckpoint);
|
||||
|
||||
MOZ_ALWAYS_SUCCEEDS(
|
||||
owningThread->Dispatch(this, NS_DISPATCH_NORMAL));
|
||||
return NS_OK;
|
||||
}
|
||||
}
|
||||
|
||||
RefPtr<ConnectionPool> connectionPool = mDatabaseInfo->mConnectionPool;
|
||||
MOZ_ASSERT(connectionPool);
|
||||
|
@ -12680,6 +12684,8 @@ CloseConnectionRunnable::Run()
|
|||
nsCOMPtr<nsIEventTarget> owningThread;
|
||||
mOwningThread.swap(owningThread);
|
||||
|
||||
// The connection could be null if EnsureConnection() didn't run or was not
|
||||
// successful in TransactionDatabaseOperationBase::RunOnConnectionThread().
|
||||
if (mDatabaseInfo->mConnection) {
|
||||
mDatabaseInfo->AssertIsOnConnectionThread();
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче