wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-21 15:57:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Bug 786683 - check success of GetFilePath() throughout nsMsgBrkMBoxStore.cpp.

Browse source 
Tag #1273
This commit is contained in:
Matt A. Tobin 2019-11-11 02:10:24 -05:00 • committed by Roy Tam
commit af8d327f15
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
mailnews/local/src/nsMsgBrkMBoxStore.cpp
View file

@ -626,14 +626,16 @@ nsMsgBrkMBoxStore::GetNewMsgOutputStream(nsIMsgFolder *aFolder,
m_streamOutstandingFolder = aFolder; m_streamOutstandingFolder = aFolder;
#endif #endif
*aReusable = true; *aReusable = true;
nsresult rv;
nsCOMPtr<nsIFile> mboxFile; nsCOMPtr<nsIFile> mboxFile;
aFolder->GetFilePath(getter_AddRefs(mboxFile)); rv = aFolder->GetFilePath(getter_AddRefs(mboxFile));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIMsgDatabase> db; nsCOMPtr<nsIMsgDatabase> db;
aFolder->GetMsgDatabase(getter_AddRefs(db)); aFolder->GetMsgDatabase(getter_AddRefs(db));
if (!db && !*aNewMsgHdr) if (!db && !*aNewMsgHdr)
NS_WARNING("no db, and no message header"); NS_WARNING("no db, and no message header");
bool exists; bool exists = false;
nsresult rv;
mboxFile->Exists(&exists); mboxFile->Exists(&exists);
if (!exists) { if (!exists) {
rv = mboxFile->Create(nsIFile::NORMAL_FILE_TYPE, 0600); rv = mboxFile->Create(nsIFile::NORMAL_FILE_TYPE, 0600);
@ -701,7 +703,8 @@ nsMsgBrkMBoxStore::DiscardNewMessage(nsIOutputStream *aOutputStream,
nsCOMPtr<nsIMsgFolder> folder; nsCOMPtr<nsIMsgFolder> folder;
nsresult rv = aNewHdr->GetFolder(getter_AddRefs(folder)); nsresult rv = aNewHdr->GetFolder(getter_AddRefs(folder));
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
folder->GetFilePath(getter_AddRefs(mboxFile)); rv = folder->GetFilePath(getter_AddRefs(mboxFile));
NS_ENSURE_SUCCESS(rv, rv);
return mboxFile->SetFileSize(hdrOffset); return mboxFile->SetFileSize(hdrOffset);
} }
@ -757,7 +760,8 @@ nsMsgBrkMBoxStore::GetMsgInputStream(nsIMsgFolder *aMsgFolder,
*aReusable = true; *aReusable = true;
nsCOMPtr<nsIFile> mboxFile; nsCOMPtr<nsIFile> mboxFile;
aMsgFolder->GetFilePath(getter_AddRefs(mboxFile)); nsresult rv = aMsgFolder->GetFilePath(getter_AddRefs(mboxFile));
NS_ENSURE_SUCCESS(rv, rv);
return NS_NewLocalFileInputStream(aResult, mboxFile); return NS_NewLocalFileInputStream(aResult, mboxFile);
} }
@ -870,10 +874,11 @@ nsMsgBrkMBoxStore::GetOutputStream(nsIArray *aHdrArray,
m_outputStreams.Remove(URI); m_outputStreams.Remove(URI);
} }
} }
nsCOMPtr<nsIFile> mboxFile;
folder->GetFilePath(getter_AddRefs(mboxFile));
if (!outputStream) if (!outputStream)
{ {
nsCOMPtr<nsIFile> mboxFile;
rv = folder->GetFilePath(getter_AddRefs(mboxFile));
NS_ENSURE_SUCCESS(rv, rv);
rv = MsgGetFileStream(mboxFile, getter_AddRefs(outputStream)); rv = MsgGetFileStream(mboxFile, getter_AddRefs(outputStream));
seekableStream = do_QueryInterface(outputStream); seekableStream = do_QueryInterface(outputStream);
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))