Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ensure that g_timerMap is always initialized before it is used (patch 1060619, bug 1060591)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-11-11 19:08:15 +00:00
parent b11dd16306
commit ee1025a7e0
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/msw/timer.cpp
View File

@@ -46,7 +46,15 @@
WX_DECLARE_HASH_MAP(unsigned long, wxTimer *, wxIntegerHash, wxIntegerEqual, WX_DECLARE_HASH_MAP(unsigned long, wxTimer *, wxIntegerHash, wxIntegerEqual,
wxTimerMap); wxTimerMap);
static wxTimerMap g_timerMap; // instead of using a global here, wrap it in a static function as otherwise it
// could have been used before being initialized if a timer object were created
// globally
static wxTimerMap& TimerMap()
{
static wxTimerMap s_timerMap;
return s_timerMap;
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// private functions // private functions
@@ -103,7 +111,7 @@ bool wxTimer::Start(int milliseconds, bool oneShot)
// check that SetTimer() didn't reuse an existing id: according to the MSDN // check that SetTimer() didn't reuse an existing id: according to the MSDN
// this can happen and this would be catastrophic to us as we rely on ids // this can happen and this would be catastrophic to us as we rely on ids
// uniquely identifying the timers because we use them as keys in the hash // uniquely identifying the timers because we use them as keys in the hash
if ( g_timerMap.find(m_id) != g_timerMap.end() ) if ( TimerMap().find(m_id) != TimerMap().end() )
{ {
wxLogError(_("Timer creation failed.")); wxLogError(_("Timer creation failed."));
@@ -113,7 +121,7 @@ bool wxTimer::Start(int milliseconds, bool oneShot)
return false; return false;
} }
g_timerMap[m_id] = this; TimerMap()[m_id] = this;
return true; return true;
} }
@@ -124,7 +132,7 @@ void wxTimer::Stop()
{ {
::KillTimer(NULL, m_id); ::KillTimer(NULL, m_id);
g_timerMap.erase(m_id); TimerMap().erase(m_id);
} }
m_id = 0; m_id = 0;
@@ -150,9 +158,9 @@ wxTimerProc(HWND WXUNUSED(hwnd),
UINT idTimer, UINT idTimer,
DWORD WXUNUSED(dwTime)) DWORD WXUNUSED(dwTime))
{ {
wxTimerMap::iterator node = g_timerMap.find((unsigned long)idTimer); wxTimerMap::iterator node = TimerMap().find((unsigned long)idTimer);
wxCHECK_RET( node != g_timerMap.end(), wxT("bogus timer id in wxTimerProc") ); wxCHECK_RET( node != TimerMap().end(), wxT("bogus timer id in wxTimerProc") );
wxProcessTimer(*(node->second)); wxProcessTimer(*(node->second));
} }