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

175795 r=rdayal sr=bienvenu fixing a crash in purgeService by making mPurgeArray not a pointer of nsVoidArray

Browse Source 
mPurgeArray has lifetime equal to that of nsMsgPurgeService
This commit is contained in:
naving%netscape.com 2002-10-24 02:06:03 +00:00
parent 9582866f42
commit ae31ebabf6
2 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
mailnews/base/src/nsMsgPurgeService.cpp
View File

@ -65,8 +65,6 @@ void OnPurgeTimer(nsITimer *timer, void *aPurgeService)
nsMsgPurgeService::nsMsgPurgeService() nsMsgPurgeService::nsMsgPurgeService()
{ {
NS_INIT_ISUPPORTS(); NS_INIT_ISUPPORTS();
mPurgeArray = nsnull;
mHaveShutdown = PR_FALSE; mHaveShutdown = PR_FALSE;
} }
@ -76,15 +74,13 @@ nsMsgPurgeService::~nsMsgPurgeService()
mPurgeTimer->Cancel(); mPurgeTimer->Cancel();
} }
PRInt32 count = mPurgeArray->Count(); PRInt32 count = mPurgeArray.Count();
PRInt32 i; PRInt32 i;
for(i=0; i < count; i++) for(i=0; i < count; i++)
{ {
nsPurgeEntry *purgeEntry = (nsPurgeEntry*)mPurgeArray->ElementAt(i); nsPurgeEntry *purgeEntry = (nsPurgeEntry*)mPurgeArray.ElementAt(i);
delete purgeEntry; delete purgeEntry;
} }
delete mPurgeArray;
if(!mHaveShutdown) if(!mHaveShutdown)
{ {
Shutdown(); Shutdown();
@ -100,17 +96,8 @@ NS_IMETHODIMP nsMsgPurgeService::Init()
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
accountManager->AddIncomingServerListener(this); accountManager->AddIncomingServerListener(this);
if(mHaveShutdown) //in turbo mode on profile change we don't need to do anything below this
{
mHaveShutdown = PR_FALSE; mHaveShutdown = PR_FALSE;
return NS_OK; return NS_OK;
}
mPurgeArray = new nsVoidArray();
if(!mPurgeArray)
return NS_ERROR_OUT_OF_MEMORY;
return NS_OK;
} }
NS_IMETHODIMP nsMsgPurgeService::Shutdown() NS_IMETHODIMP nsMsgPurgeService::Shutdown()
@ -220,8 +207,8 @@ nsresult nsMsgPurgeService::RemoveServer(nsIMsgIncomingServer *server)
PRInt32 pos = FindServer(server); PRInt32 pos = FindServer(server);
if(pos != -1) if(pos != -1)
{ {
nsPurgeEntry *purgeEntry = (nsPurgeEntry*)mPurgeArray->ElementAt(pos); nsPurgeEntry *purgeEntry = (nsPurgeEntry*)mPurgeArray.ElementAt(pos);
mPurgeArray->RemoveElementAt(pos); mPurgeArray.RemoveElementAt(pos);
delete purgeEntry; delete purgeEntry;
} }
@ -251,10 +238,10 @@ NS_IMETHODIMP nsMsgPurgeService::OnServerChanged(nsIMsgIncomingServer *server)
PRInt32 nsMsgPurgeService::FindServer(nsIMsgIncomingServer *server) PRInt32 nsMsgPurgeService::FindServer(nsIMsgIncomingServer *server)
{ {
PRInt32 count = mPurgeArray->Count(); PRInt32 count = mPurgeArray.Count();
for(PRInt32 i = 0; i < count; i++) for(PRInt32 i = 0; i < count; i++)
{ {
nsPurgeEntry *purgeEntry = (nsPurgeEntry*)mPurgeArray->ElementAt(i); nsPurgeEntry *purgeEntry = (nsPurgeEntry*)mPurgeArray.ElementAt(i);
if(server == purgeEntry->server.get()) if(server == purgeEntry->server.get())
return i; return i;
} }
@ -264,15 +251,15 @@ PRInt32 nsMsgPurgeService::FindServer(nsIMsgIncomingServer *server)
nsresult nsMsgPurgeService::AddPurgeEntry(nsPurgeEntry *purgeEntry) nsresult nsMsgPurgeService::AddPurgeEntry(nsPurgeEntry *purgeEntry)
{ {
PRInt32 i; PRInt32 i;
PRInt32 count = mPurgeArray->Count(); PRInt32 count = mPurgeArray.Count();
for(i = 0; i < count; i++) for(i = 0; i < count; i++)
{ {
nsPurgeEntry *current = (nsPurgeEntry*)mPurgeArray->ElementAt(i); nsPurgeEntry *current = (nsPurgeEntry*)mPurgeArray.ElementAt(i);
if(purgeEntry->nextPurgeTime < current->nextPurgeTime) if(purgeEntry->nextPurgeTime < current->nextPurgeTime)
break; break;
} }
mPurgeArray->InsertElementAt(purgeEntry, i); mPurgeArray.InsertElementAt(purgeEntry, i);
return NS_OK; return NS_OK;
} }
@ -283,17 +270,17 @@ nsresult nsMsgPurgeService::SetNextPurgeTime(nsPurgeEntry *purgeEntry, nsTime st
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
purgeEntry->nextPurgeTime = startTime; purgeEntry->nextPurgeTime = startTime;
for (PRInt32 i=0; i < mPurgeArray->Count()+1; i++) for (PRInt32 i=0; i < mPurgeArray.Count()+1; i++)
purgeEntry->nextPurgeTime += nsInt64(gMinDelayBetweenPurges); //let us stagger them out by 5 mins if they happen to start at same time purgeEntry->nextPurgeTime += nsInt64(gMinDelayBetweenPurges); //let us stagger them out by 5 mins if they happen to start at same time
return NS_OK; return NS_OK;
} }
nsresult nsMsgPurgeService::SetupNextPurge() nsresult nsMsgPurgeService::SetupNextPurge()
{ {
if(mPurgeArray->Count() > 0) if(mPurgeArray.Count() > 0)
{ {
//Get the next purge entry //Get the next purge entry
nsPurgeEntry *purgeEntry = (nsPurgeEntry*)mPurgeArray->ElementAt(0); nsPurgeEntry *purgeEntry = (nsPurgeEntry*)mPurgeArray.ElementAt(0);
nsTime currentTime; nsTime currentTime;
nsInt64 purgeDelay; nsInt64 purgeDelay;
nsInt64 ms(1000); nsInt64 ms(1000);
@ -322,9 +309,9 @@ nsresult nsMsgPurgeService::SetupNextPurge()
nsresult nsMsgPurgeService::PerformPurge() nsresult nsMsgPurgeService::PerformPurge()
{ {
nsTime currentTime; nsTime currentTime;
for(PRInt32 i = 0;i < mPurgeArray->Count(); i++) for(PRInt32 i = 0;i < mPurgeArray.Count(); i++)
{ {
nsPurgeEntry *current = (nsPurgeEntry*)mPurgeArray->ElementAt(i); nsPurgeEntry *current = (nsPurgeEntry*)mPurgeArray.ElementAt(i);
if(current->nextPurgeTime < currentTime) if(current->nextPurgeTime < currentTime)
{ {
PRBool serverBusy = PR_FALSE; PRBool serverBusy = PR_FALSE;
@ -346,7 +333,7 @@ nsresult nsMsgPurgeService::PerformPurge()
else else
current = nsnull; current = nsnull;
} }
mPurgeArray->RemoveElementAt(i); mPurgeArray.RemoveElementAt(i);
i--; //Because we removed it we need to look at the one that just moved up. i--; //Because we removed it we need to look at the one that just moved up.
if (current) if (current)

2
mailnews/base/src/nsMsgPurgeService.h
View File

@ -91,7 +91,7 @@ protected:
nsCOMPtr<nsIMsgSearchSession> mSearchSession; nsCOMPtr<nsIMsgSearchSession> mSearchSession;
nsCOMPtr<nsIMsgFolder> mSearchFolder; nsCOMPtr<nsIMsgFolder> mSearchFolder;
nsCOMPtr<nsISupportsArray> mHdrsToDelete; nsCOMPtr<nsISupportsArray> mHdrsToDelete;
nsVoidArray *mPurgeArray; nsVoidArray mPurgeArray;
PRBool mHaveShutdown; PRBool mHaveShutdown;
}; };