Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 13:55:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

additional fix for 218885 crash at shutdown when receiving pop3 mail, r/sr=mscott

Browse Source
This commit is contained in:
bienvenu%nventure.com 2003-09-11 03:19:44 +00:00
parent 822192319f
commit c03a67666d
1 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
mailnews/local/src/nsParseMailbox.cpp
View File

@ -521,17 +521,17 @@ NS_IMETHODIMP nsParseMailMessageState::Clear()
NS_IMETHODIMP nsParseMailMessageState::SetState(nsMailboxParseState aState) NS_IMETHODIMP nsParseMailMessageState::SetState(nsMailboxParseState aState)
{ {
m_state = aState; m_state = aState;
return NS_OK; return NS_OK;
} }
NS_IMETHODIMP nsParseMailMessageState::GetState(nsMailboxParseState *aState) NS_IMETHODIMP nsParseMailMessageState::GetState(nsMailboxParseState *aState)
{ {
if (!aState) if (!aState)
return NS_ERROR_NULL_POINTER; return NS_ERROR_NULL_POINTER;
*aState = m_state; *aState = m_state;
return NS_OK; return NS_OK;
} }
NS_IMETHODIMP NS_IMETHODIMP
@ -545,10 +545,10 @@ nsParseMailMessageState::GetEnvelopePos(PRUint32 *aEnvelopePos)
NS_IMETHODIMP nsParseMailMessageState::SetEnvelopePos(PRUint32 aEnvelopePos) NS_IMETHODIMP nsParseMailMessageState::SetEnvelopePos(PRUint32 aEnvelopePos)
{ {
m_envelope_pos = aEnvelopePos; m_envelope_pos = aEnvelopePos;
m_position = m_envelope_pos; m_position = m_envelope_pos;
m_headerstartpos = m_position; m_headerstartpos = m_position;
return NS_OK; return NS_OK;
} }
NS_IMETHODIMP nsParseMailMessageState::GetNewMsgHdr(nsIMsgDBHdr ** aMsgHeader) NS_IMETHODIMP nsParseMailMessageState::GetNewMsgHdr(nsIMsgDBHdr ** aMsgHeader)
@ -563,52 +563,52 @@ NS_IMETHODIMP nsParseMailMessageState::GetNewMsgHdr(nsIMsgDBHdr ** aMsgHeader)
NS_IMETHODIMP nsParseMailMessageState::ParseAFolderLine(const char *line, PRUint32 lineLength) NS_IMETHODIMP nsParseMailMessageState::ParseAFolderLine(const char *line, PRUint32 lineLength)
{ {
ParseFolderLine(line, lineLength); ParseFolderLine(line, lineLength);
return NS_OK; return NS_OK;
} }
PRInt32 nsParseMailMessageState::ParseFolderLine(const char *line, PRUint32 lineLength) PRInt32 nsParseMailMessageState::ParseFolderLine(const char *line, PRUint32 lineLength)
{ {
int status = 0; int status = 0;
if (m_state == nsIMsgParseMailMsgState::ParseHeadersState) if (m_state == nsIMsgParseMailMsgState::ParseHeadersState)
{ {
if (EMPTY_MESSAGE_LINE(line)) if (EMPTY_MESSAGE_LINE(line))
{ {
/* End of headers. Now parse them. */ /* End of headers. Now parse them. */
status = ParseHeaders(); status = ParseHeaders();
NS_ASSERTION(status >= 0, "error parsing headers parsing mailbox"); NS_ASSERTION(status >= 0, "error parsing headers parsing mailbox");
if (status < 0) if (status < 0)
return status; return status;
status = FinalizeHeaders(); status = FinalizeHeaders();
NS_ASSERTION(status >= 0, "error finalizing headers parsing mailbox"); NS_ASSERTION(status >= 0, "error finalizing headers parsing mailbox");
if (status < 0) if (status < 0)
return status; return status;
m_state = nsIMsgParseMailMsgState::ParseBodyState; m_state = nsIMsgParseMailMsgState::ParseBodyState;
} }
else else
{ {
/* Otherwise, this line belongs to a header. So append it to the /* Otherwise, this line belongs to a header. So append it to the
header data, and stay in MBOX `MIME_PARSE_HEADERS' state. header data, and stay in MBOX `MIME_PARSE_HEADERS' state.
*/ */
m_headers.AppendBuffer(line, lineLength); m_headers.AppendBuffer(line, lineLength);
} }
} }
else if ( m_state == nsIMsgParseMailMsgState::ParseBodyState) else if ( m_state == nsIMsgParseMailMsgState::ParseBodyState)
{ {
m_body_lines++; m_body_lines++;
} }
m_position += lineLength; m_position += lineLength;
return 0; return 0;
} }
NS_IMETHODIMP nsParseMailMessageState::SetMailDB(nsIMsgDatabase *mailDB) NS_IMETHODIMP nsParseMailMessageState::SetMailDB(nsIMsgDatabase *mailDB)
{ {
m_mailDB = mailDB; m_mailDB = mailDB;
return NS_OK; return NS_OK;
} }
NS_IMETHODIMP nsParseMailMessageState::SetDBFolderStream(nsIOFileStream *fileStream) NS_IMETHODIMP nsParseMailMessageState::SetDBFolderStream(nsIOFileStream *fileStream)
@ -1706,8 +1706,8 @@ int nsParseNewMailState::MarkFilteredMessageRead(nsIMsgDBHdr *msgHdr)
} }
nsresult nsParseNewMailState::MoveIncorporatedMessage(nsIMsgDBHdr *mailHdr, nsresult nsParseNewMailState::MoveIncorporatedMessage(nsIMsgDBHdr *mailHdr,
nsIMsgDatabase *sourceDB, nsIMsgDatabase *sourceDB,
const nsACString& destFolderUri, const nsACString& destFolderUri,
nsIMsgFilter *filter, nsIMsgFilter *filter,
nsIMsgWindow *msgWindow) nsIMsgWindow *msgWindow)
{ {
@ -1715,6 +1715,7 @@ nsresult nsParseNewMailState::MoveIncorporatedMessage(nsIMsgDBHdr *mailHdr,
nsIOFileStream *destFile; nsIOFileStream *destFile;
nsCOMPtr<nsIRDFService> rdf(do_GetService(kRDFServiceCID, &err)); nsCOMPtr<nsIRDFService> rdf(do_GetService(kRDFServiceCID, &err));
NS_ENSURE_SUCCESS(err, err);
nsCOMPtr<nsIRDFResource> res; nsCOMPtr<nsIRDFResource> res;
err = rdf->GetResource(destFolderUri, getter_AddRefs(res)); err = rdf->GetResource(destFolderUri, getter_AddRefs(res));
if (NS_FAILED(err)) if (NS_FAILED(err))