adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-05 16:33:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix a couple of issues pointed out by https://scan.coverity.com/

Browse Source
This commit is contained in:
Alexey Sokolov
2016-12-26 17:22:09 +00:00
parent b666931883
commit 2fcde9f2e1
6 changed files with 23 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/znc.cpp
+4 -13
View File
@@ -1252,7 +1252,7 @@ bool CZNC::LoadUsers(CConfig& config, CString& sError) {
CUtils::PrintMessage("Loading user [" + sUserName + "]");
CUser* pUser = new CUser(sUserName);
std::unique_ptr<CUser> pUser(new CUser(sUserName));
if (!m_sStatusPrefix.empty()) {
if (!pUser->SetStatusPrefix(m_sStatusPrefix)) {
@@ -1265,35 +1265,26 @@ bool CZNC::LoadUsers(CConfig& config, CString& sError) {
if (!pUser->ParseConfig(pSubConf, sError)) {
CUtils::PrintError(sError);
delete pUser;
pUser = nullptr;
return false;
}
if (!pSubConf->empty()) {
sError = "Unhandled lines in config for User [" + sUserName + "]!";
CUtils::PrintError(sError);
DumpConfig(pSubConf);
return false;
}
CString sErr;
if (!AddUser(pUser, sErr, true)) {
sError = "Invalid user [" + pUser->GetUserName() + "] " + sErr;
if (!AddUser(pUser.release(), sErr, true)) {
sError = "Invalid user [" + sUserName + "] " + sErr;
}
if (!sError.empty()) {
CUtils::PrintError(sError);
if (pUser) {
pUser->SetBeingDeleted(true);
delete pUser;
pUser = nullptr;
}
pUser->SetBeingDeleted(true);
return false;
}
pUser = nullptr;
}
if (m_msUsers.empty()) {