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

Make PL_InitEvent callers stop doing potentially dangerous casting of function pointers. b=305278 r=dougt sr=darin

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@184589 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org
2005-11-14 20:09:51 +00:00
parent ad69dfbd5c
commit ea56e835a3
25 changed files with 174 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/xpcom/threads/nsTimerImpl.cpp
View File

@@ -436,8 +436,10 @@ struct TimerEventType : public PLEvent {
};
void* handleTimerEvent(TimerEventType* event)
PR_STATIC_CALLBACK(void*) handleTimerEvent(PLEvent* aEvent)
{
TimerEventType *event = NS_STATIC_CAST(TimerEventType*, aEvent);
nsTimerImpl* timer = NS_STATIC_CAST(nsTimerImpl*, event->owner);
if (event->mGeneration != timer->GetGeneration())
return nsnull;
@@ -467,8 +469,10 @@ void* handleTimerEvent(TimerEventType* event)
return nsnull;
}
void destroyTimerEvent(TimerEventType* event)
PR_STATIC_CALLBACK(void) destroyTimerEvent(PLEvent* aEvent)
{
TimerEventType *event = NS_STATIC_CAST(TimerEventType*, aEvent);
nsTimerImpl *timer = NS_STATIC_CAST(nsTimerImpl*, event->owner);
NS_RELEASE(timer);
PR_DELETE(event);
@@ -486,9 +490,7 @@ void nsTimerImpl::PostTimerEvent()
return;
// initialize
PL_InitEvent((PLEvent*)event, this,
(PLHandleEventProc)handleTimerEvent,
(PLDestroyEventProc)destroyTimerEvent);
PL_InitEvent((PLEvent*)event, this, handleTimerEvent, destroyTimerEvent);
// Since TimerThread addref'd 'this' for us, we don't need to addref here.
// We will release in destroyMyEvent. We do need to copy the generation