Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add null pointer checks to avoid crashing during history commit - avoid crash described in bug 62968

Browse Source 
r=blake
(no sr= cuz it's so freakin simple)


git-svn-id: svn://10.0.0.236/trunk@84259 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alecf%netscape.com 2001-01-02 05:27:13 +00:00
parent 6a1b91d304
commit ae730520de
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/xpfe/components/history/src/nsGlobalHistory.cpp
View File

@ -1752,6 +1752,10 @@ nsGlobalHistory::OpenExistingFile(nsIMdbFactory *factory, const char *filePath)
mdbOid oid = { kToken_HistoryRowScope, 1 };
err = mStore->GetTable(mEnv, &oid, &mTable);
NS_ENSURE_TRUE(err == 0, NS_ERROR_FAILURE);
if (!mTable) {
NS_WARNING("Your history file is somehow corrupt.. deleting it.");
return NS_ERROR_FAILURE;
}
return NS_OK;
}
@ -1780,6 +1784,7 @@ nsGlobalHistory::OpenNewFile(nsIMdbFactory *factory, const char *filePath)
// Create the one and only table in the history db
err = mStore->NewTable(mEnv, kToken_HistoryRowScope, kToken_HistoryKind, PR_TRUE, nsnull, &mTable);
if (err != 0) return NS_ERROR_FAILURE;
if (!mTable) return NS_ERROR_FAILURE;
// Force a commit now to get it written out.
nsMdbPtr<nsIMdbThumb> thumb(mEnv);
@ -1841,8 +1846,8 @@ nsresult nsGlobalHistory::Commit(eCommitType commitType)
nsresult err = NS_OK;
nsMdbPtr<nsIMdbThumb> thumb(mEnv);
if (!mStore)
return NS_ERROR_NULL_POINTER;
if (!mStore || !mTable)
return NS_ERROR_NOT_INITIALIZED;
if (commitType == kLargeCommit || commitType == kSessionCommit)
{