Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-19 09:30:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

potential fix for crash in nsMsgDatabase::GetTableCreateIfMissing, better detection of invalid db's, sr=mscott, a=asa 292041

Browse Source
This commit is contained in:
bienvenu%nventure.com 2005-06-17 04:14:57 +00:00
parent 503dda31e4
commit 164aa51503
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mailnews/db/msgdb/src/nsMsgDatabase.cpp
View File

@ -1242,8 +1242,8 @@ nsresult nsMsgDatabase::OpenMDB(const char *dbName, PRBool create)
if (ret == 0 && outDone)
{
ret = myMDBFactory->ThumbToOpenStore(m_mdbEnv, thumb, &m_mdbStore);
if (ret == NS_OK && m_mdbStore)
ret = InitExistingDB();
if (ret == NS_OK)
ret = (m_mdbStore) ? InitExistingDB() : NS_ERROR_FAILURE;
}
#ifdef DEBUG_bienvenu1
DumpContents();
@ -1266,7 +1266,7 @@ nsresult nsMsgDatabase::OpenMDB(const char *dbName, PRBool create)
ret = myMDBFactory->CreateNewFileStore(m_mdbEnv, dbHeap,
newFile, &inOpenPolicy, &m_mdbStore);
if (ret == NS_OK)
ret = InitNewDB();
ret = (m_mdbStore) ? InitNewDB() : NS_ERROR_FAILURE;
}
NS_RELEASE(newFile); // always release our file ref, store has own
}
@ -1275,6 +1275,7 @@ nsresult nsMsgDatabase::OpenMDB(const char *dbName, PRBool create)
nsCRT::free(nativeFileName);
}
}
NS_ASSERTION(NS_SUCCEEDED(ret), "failed opening mdb");
return ret;
}
@ -1504,13 +1505,10 @@ nsresult nsMsgDatabase::InitNewDB()
err = InitMDBInfo();
if (err == NS_OK)
{
// why is this bad? dbFolderInfo is tightly tightly bound to nsMsgDatabase. It will
// never be provided by someone else. It could be strictly embedded inside nsMsgDatabase
// but I wanted to keep nsMsgDatabase a little bit smaller
nsDBFolderInfo *dbFolderInfo = new nsDBFolderInfo(this); // this is bad!! Should go through component manager
nsDBFolderInfo *dbFolderInfo = new nsDBFolderInfo(this);
if (dbFolderInfo)
{
NS_ADDREF(dbFolderInfo); // mscott: shouldn't have to do this...go through c. manager
NS_ADDREF(dbFolderInfo);
err = dbFolderInfo->AddToNewMDB();
dbFolderInfo->SetVersion(GetCurVersion());
nsIMdbStore *store = GetStore();