Permalink
Browse files

Fix use-after-free which may happen during shutdown

If a module, e.g. keepnick, tries to remove a timer in
OnIRCDisconnected.

Thanks to KindOne for the report.
  • Loading branch information...
1 parent 20c5c7d commit 8fdb530ee321fe0b5a7b0ba5d409c170d8091178 @DarthGandalf DarthGandalf committed Mar 31, 2013
Showing with 6 additions and 1 deletion.
  1. +1 −1 modules/keepnick.cpp
  2. +5 −0 src/znc.cpp
@@ -121,7 +121,7 @@ class CKeepNickMod : public CModule {
return;
m_pTimer->Stop();
- RemTimer(m_pTimer->GetName());
+ RemTimer(m_pTimer);
m_pTimer = NULL;
}
View
@@ -51,6 +51,11 @@ CZNC::~CZNC() {
for (map<CString,CUser*>::iterator a = m_msUsers.begin(); a != m_msUsers.end(); ++a) {
a->second->GetModules().UnloadAll();
+
+ const vector<CIRCNetwork*>& networks = a->second->GetNetworks();
+ for (vector<CIRCNetwork*>::const_iterator b = networks.begin(); b != networks.end(); ++b) {
+ (*b)->GetModules().UnloadAll();
+ }
}
for (size_t b = 0; b < m_vpListeners.size(); b++) {

0 comments on commit 8fdb530

Please sign in to comment.