Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix 332119, crash when unable to create new .msf file, sr=mscott

Browse Source
This commit is contained in:
bienvenu%nventure.com 2006-04-03 19:47:16 +00:00
parent e6f36c8ce2
commit 5fafea771f
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mailnews/base/resources/locale/en-US/messenger.properties
View File

@ -111,6 +111,7 @@ verboseFolderFormat=%1$S on %2$S
filterFolderTruncateFailed=There was an error truncating the Inbox after filtering a message to folder '%1$S'. You may need to shutdown %2$S and delete INBOX.msf.
mailboxTooLarge=The folder %S is full, and can't hold any more messages. To make room for more messages, delete any old or unwanted mail and compact the folder.
errorGettingDB=Unable to open the summary file for '%S'. Perhaps there was an error on disk, or the full path is too long.
defaultServerTag=(Default)
useDefaultServer=Use default server

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

@ -174,6 +174,10 @@ NS_IMETHODIMP nsMsgDBService::OpenFolderDB(nsIMsgFolder *aFolder, PRBool aCreate
return rv;
}
// This method is called when the caller is trying to create a db without
// having a corresponding nsIMsgFolder object. This happens in a few
// situatins, including imap folder discovery, compacting local folders,
// and copying local folders.
NS_IMETHODIMP nsMsgDBService::OpenMailDBFromFileSpec(nsIFileSpec *aFolderName, PRBool aCreate, PRBool aLeaveInvalidDB, nsIMsgDatabase** pMessageDB)
{
if (!aFolderName)
@ -190,6 +194,8 @@ NS_IMETHODIMP nsMsgDBService::OpenMailDBFromFileSpec(nsIFileSpec *aFolderName, P
nsCOMPtr <nsIMsgDatabase> msgDB = do_CreateInstance(NS_MAILBOXDB_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
rv = msgDB->Open(aFolderName, aCreate, aLeaveInvalidDB);
if (rv == NS_ERROR_FILE_TARGET_DOES_NOT_EXIST)
return rv;
NS_IF_ADDREF(*pMessageDB = msgDB);
if (aCreate && msgDB && rv == NS_MSG_ERROR_FOLDER_SUMMARY_MISSING)
rv = NS_OK;
@ -1111,7 +1117,9 @@ NS_IMETHODIMP nsMsgDatabase::Open(nsIFileSpec *aFolderName, PRBool aCreate, PRBo
summaryFileExists = summaryFile.Exists() && summaryFile.GetFileSize() > 0;
err = OpenMDB((const char *) summaryFile, aCreate);
if (err == NS_ERROR_FILE_TARGET_DOES_NOT_EXIST)
return err;
if (NS_SUCCEEDED(err))
{
GetDBFolderInfo(&folderInfo);
@ -1262,6 +1270,8 @@ nsresult nsMsgDatabase::OpenMDB(const char *dbName, PRBool create)
{
nsIMdbFile* newFile = 0;
ret = myMDBFactory->CreateNewFile(m_mdbEnv, dbHeap, dbName, &newFile);
if (NS_FAILED(ret))
ret = NS_ERROR_FILE_TARGET_DOES_NOT_EXIST;
if ( newFile )
{
if (ret == NS_OK)

6
mailnews/imap/src/nsImapMailFolder.cpp
View File

@ -764,7 +764,11 @@ nsImapMailFolder::UpdateFolder(nsIMsgWindow *msgWindow)
selectFolder = PR_FALSE;
}
rv = GetDatabase(msgWindow);
if (NS_FAILED(rv))
{
ThrowAlertMsg("errorGettingDB", msgWindow);
return rv;
}
PRBool canOpenThisFolder = PR_TRUE;
GetCanIOpenThisFolder(&canOpenThisFolder);