iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-05 21:12:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added try/catch for LoadModule

Browse Source 
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@484 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
prozacx
2005-09-12 03:45:57 +00:00
parent e94dbf13f6
commit da683da5b0
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Modules.cpp
View File

@@ -859,7 +859,11 @@ bool CModules::ReloadModule(const CString& sModule, const CString& sArgs, CUser*
return false;
}
if (!LoadModule(sMod, sArgs, pUser, sRetMsg)) {
try {
if (!LoadModule(sMod, sArgs, pUser, sRetMsg)) {
return false;
}
} catch(...) {
return false;
}

4
User.cpp
View File

@@ -121,7 +121,9 @@ bool CUser::Clone(const CUser& User, CString& sErrorRet) {
if (!pCurMod) {
CString sModRet;
vCurMods.LoadModule(pNewMod->GetModName(), "", this, sModRet);
try {
vCurMods.LoadModule(pNewMod->GetModName(), "", this, sModRet);
} catch (...) {}
}
}

9
UserSock.cpp
View File

@@ -810,7 +810,14 @@ void CUserSock::UserCommand(const CString& sLine) {
}
CString sModRet;
m_pUser->GetModules().LoadModule(sMod, sArgs, m_pUser, sModRet);
try {
m_pUser->GetModules().LoadModule(sMod, sArgs, m_pUser, sModRet);
} catch (CException e) {
PutStatus("Unable to load module [" + sMod + "] [" + sModRet + "]");
return;
}
PutStatus(sModRet);
#else
PutStatus("Unable to load [" + sMod + "] Modules are not enabled.");