github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 05:45:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory leak in AuditLog::init()

Browse Source
This commit is contained in:
Wenfeng Liu 2018-09-12 03:50:33 +00:00 committed by Felipe Zimmerle
parent 8c549c65c4
commit ec1112c648
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/audit_log/audit_log.cc
View File

@ -209,24 +209,36 @@ bool AuditLog::setType(AuditLogType audit_type) {
bool AuditLog::init(std::string *error) { bool AuditLog::init(std::string *error) {
audit_log::writer::Writer *tmp_writer;
if (m_status == OffAuditLogStatus || m_status == NotSetLogStatus) {
if (m_writer) {
delete m_writer;
m_writer = NULL;
}
return true;
}
if (m_type == ParallelAuditLogType) { if (m_type == ParallelAuditLogType) {
m_writer = new audit_log::writer::Parallel(this); tmp_writer = new audit_log::writer::Parallel(this);
} else if (m_type == HttpsAuditLogType) { } else if (m_type == HttpsAuditLogType) {
m_writer = new audit_log::writer::Https(this); tmp_writer = new audit_log::writer::Https(this);
} else { } else {
/* /*
* if (m_type == SerialAuditLogType * if (m_type == SerialAuditLogType
* || m_type == NotSetAuditLogType) * || m_type == NotSetAuditLogType)
* *
*/ */
m_writer = new audit_log::writer::Serial(this); tmp_writer = new audit_log::writer::Serial(this);
} }
if (m_status == OffAuditLogStatus || m_status == NotSetLogStatus) { if (tmp_writer == NULL) {
return true; error->assign("Writer memory alloc failed!");
return false;
} }
if (m_writer == NULL || m_writer->init(error) == false) { if (tmp_writer->init(error) == false) {
delete tmp_writer;
return false; return false;
} }
@ -234,10 +246,10 @@ bool AuditLog::init(std::string *error) {
if (m_status == RelevantOnlyAuditLogStatus) { if (m_status == RelevantOnlyAuditLogStatus) {
if (m_relevant.empty()) { if (m_relevant.empty()) {
/* /*
error->assign("m_relevant cannot be null while status is set to " \ error->assign("m_relevant cannot be null while status is set to " \
"RelevantOnly"); "RelevantOnly");
return false; return false;
*/ */
// FIXME: this should be a warning. There is not point to // FIXME: this should be a warning. There is not point to
// have the logs on relevant only if nothing is relevant. // have the logs on relevant only if nothing is relevant.
// //
@ -245,6 +257,12 @@ bool AuditLog::init(std::string *error) {
} }
} }
if (m_writer) {
delete m_writer;
}
m_writer = tmp_writer;
return true; return true;
} }