Bug 1275518 - Add null pointer check before accessing DatabaseInfo::mConnection. r=janv

--HG--
extra : rebase_source : 725bc0d4229624de7078195ffb56c7dfc49bbab3
This commit is contained in:
Bevis Tseng 2016-08-17 16:13:50 +08:00
Родитель 13b75c9133
Коммит f3cc098cd9
1 изменённых файлов: 11 добавлений и 5 удалений

Просмотреть файл

@ -12636,12 +12636,16 @@ IdleConnectionRunnable::Run()
if (owningThread) {
mDatabaseInfo->AssertIsOnConnectionThread();
MOZ_ASSERT(mDatabaseInfo->mConnection);
mDatabaseInfo->mConnection->DoIdleProcessing(mNeedsCheckpoint);
MOZ_ALWAYS_SUCCEEDS(
owningThread->Dispatch(this, NS_DISPATCH_NORMAL));
return NS_OK;
// 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;
@ -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();