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

Fix a crash when running a local mail filter --> if you moved the message and then had another filter fire

Browse Source 
after we moved the message we would crash.
This commit is contained in:
mscott%netscape.com 1999-09-21 21:04:43 +00:00
parent d6d7a5e883
commit 14af4ec4c1
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,6 @@
#include "nsIURL.h"
#include "nsIMsgMailNewsUrl.h"
#include "nsLocalStringBundle.h"
#include "nsIMsgFilterService.h"
#include "nsIMsgFilterList.h"
#include "nsIMsgFilter.h"
@ -1621,21 +1620,18 @@ void nsParseNewMailState::ApplyFilters(PRBool *pMoved)
{
m_msgMovedByFilter = PR_FALSE;
nsIMsgDBHdr *msgHdr = m_newMsgHdr;
nsIMsgFolder *inbox;
nsCOMPtr<nsIMsgDBHdr> msgHdr = m_newMsgHdr;
nsCOMPtr<nsIMsgFolder> inbox;
nsCOMPtr <nsIMsgFolder> rootMsgFolder = do_QueryInterface(m_rootFolder);
if (rootMsgFolder)
{
PRUint32 numFolders;
rootMsgFolder->GetFoldersWithFlag(MSG_FOLDER_FLAG_INBOX, &inbox, 1, &numFolders);
if (inbox)
NS_ADDREF(inbox);
rootMsgFolder->GetFoldersWithFlag(MSG_FOLDER_FLAG_INBOX, getter_AddRefs(inbox), 1, &numFolders);
char * headers = m_headers.GetBuffer();
PRUint32 headersSize = m_headers.GetBufferPos();
nsresult matchTermStatus;
matchTermStatus = m_filterList->ApplyFiltersToHdr(nsMsgFilterType::InboxRule, msgHdr, inbox,
m_mailDB, headers, headersSize, this);
NS_IF_RELEASE(inbox);
}
if (pMoved)
@ -1654,13 +1650,16 @@ NS_IMETHODIMP nsParseNewMailState::ApplyFilterHit(nsIMsgFilter *filter, PRBool *
NS_ASSERTION(PR_FALSE, "need to return status!");
return NS_ERROR_NULL_POINTER;
}
*applyMore = PR_TRUE;
// look at action - currently handle move
#ifdef DEBUG_bienvenu
printf("got a rule hit!\n");
#endif
if (NS_SUCCEEDED(filter->GetAction(&actionType, &value)))
{
nsIMsgDBHdr *msgHdr = m_newMsgHdr;
nsCOMPtr<nsIMsgDBHdr> msgHdr = m_newMsgHdr;
PRUint32 msgFlags;
nsCAutoString trashNameVal;
@ -1734,7 +1733,10 @@ NS_IMETHODIMP nsParseNewMailState::ApplyFilterHit(nsIMsgFilter *filter, PRBool *
}
nsresult err = MoveIncorporatedMessage(msgHdr, m_mailDB, (char *) value, filter);
if (NS_SUCCEEDED(err))
{
m_msgMovedByFilter = PR_TRUE;
*applyMore = PR_FALSE;
}
}
break;