adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-07 09:22:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1585 from Wolf480pl/adduser-fix

Browse Source 
Fix memory leak and null dereference in CZNC::LoadUsers when reading invalid config
This commit is contained in:
Alexey Sokolov
2018-08-08 00:02:56 +01:00
committed by GitHub
parent 33c612ba5c 80f9baf0a6
commit 61513e96b7
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/znc.cpp
+4 -5
View File
@@ -1275,13 +1275,12 @@ bool CZNC::LoadUsers(CConfig& config, CString& sError) {
}
CString sErr;
if (!AddUser(pUser.release(), sErr, true)) {
CUser* pRawUser = pUser.release();
if (!AddUser(pRawUser, sErr, true)) {
sError = "Invalid user [" + sUserName + "] " + sErr;
}
if (!sError.empty()) {
CUtils::PrintError(sError);
pUser->SetBeingDeleted(true);
pRawUser->SetBeingDeleted(true);
delete pRawUser;
return false;
}
}