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

fix crash on exit in nsMsgSearchSession destructor, 313357 sr=mscott

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@183122 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bienvenu%nventure.com
2005-10-27 13:46:45 +00:00
parent 469dfecc38
commit bc00a445b1
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/mailnews/base/search/src/nsMsgLocalSearch.cpp
View File

@@ -125,11 +125,9 @@ nsMsgSearchBoolExpression::nsMsgSearchBoolExpression (nsMsgSearchBoolExpression
nsMsgSearchBoolExpression::~nsMsgSearchBoolExpression()
{
// we must recursively destroy all sub expressions before we destroy ourself.....We leave search terms alone!
if (m_leftChild)
delete m_leftChild;
if (m_rightChild)
delete m_rightChild;
// we must recursively destroy all sub expressions before we destroy ourself.....We leave search terms alone!
delete m_leftChild;
delete m_rightChild;
}
nsMsgSearchBoolExpression *
@@ -590,7 +588,7 @@ nsresult nsMsgSearchOfflineMail::MatchTerms(nsIMsgDBHdr *msgToMatch,
PRUint32 headerSize,
PRBool Filtering,
nsMsgSearchBoolExpression ** aExpressionTree,
PRBool *pResult)
PRBool *pResult)
{
NS_ENSURE_ARG(aExpressionTree);
nsresult err;

3
mozilla/mailnews/base/search/src/nsMsgSearchSession.cpp
View File

@@ -96,6 +96,7 @@ nsMsgSearchSession::AddSearchTerm(nsMsgSearchAttribValue attrib,
m_termList->AppendElement (pTerm);
// force the expression tree to rebuild whenever we change the terms
delete m_expressionTree;
m_expressionTree = nsnull;
return NS_OK;
}
@@ -105,6 +106,7 @@ nsMsgSearchSession::AppendTerm(nsIMsgSearchTerm *aTerm)
NS_ENSURE_ARG_POINTER(aTerm);
NS_ENSURE_TRUE(m_termList, NS_ERROR_NOT_INITIALIZED);
delete m_expressionTree;
m_expressionTree = nsnull;
return m_termList->AppendElement(aTerm);
}
@@ -648,7 +650,6 @@ void nsMsgSearchSession::DestroyScopeList()
void nsMsgSearchSession::DestroyTermList ()
{
delete m_expressionTree;
m_termList->Clear();
}