Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #203 from Arkshine/fix/crash-on-shutdown

Browse Source 
Fix crash by freeing memory the right way
This commit is contained in:
Vincent Herbet 2015-02-12 14:46:53 +01:00
commit 7452317c10
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
amxmodx/CvarManager.cpp
View File

@ -618,19 +618,25 @@ void CvarManager::OnAmxxShutdown()
{ {
// Free everything. // Free everything.
for (CvarsList::iterator cvar = m_Cvars.begin(); cvar != m_Cvars.end(); cvar = m_Cvars.erase(cvar)) CvarsList::iterator iter = m_Cvars.begin();
while (iter != m_Cvars.end())
{ {
for (size_t i = 0; i < (*cvar)->binds.length(); ++i) CvarInfo* cvar = (*iter);
for (size_t i = 0; i < cvar->binds.length(); ++i)
{ {
delete (*cvar)->binds[i]; delete cvar->binds[i];
} }
for (size_t i = 0; i < (*cvar)->hooks.length(); ++i) for (size_t i = 0; i < cvar->hooks.length(); ++i)
{ {
delete (*cvar)->hooks[i]; delete cvar->hooks[i];
} }
delete (*cvar); iter = m_Cvars.erase(iter);
delete cvar;
} }
m_Cache.clear(); m_Cache.clear();