Skip to content

Commit b872f11

Browse files
committed
Fixed memory leak in examples/reading_logs_via_rule_message
1 parent 4288f5a commit b872f11

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

examples/reading_logs_via_rule_message/reading_logs_via_rule_message.h

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -130,29 +130,25 @@ class ReadingLogsViaRuleMessage {
130130
struct data_ms dms;
131131
void *status;
132132

133-
modsecurity::ModSecurity *modsec;
134-
modsecurity::RulesSet *rules;
135-
136-
modsec = new modsecurity::ModSecurity();
133+
auto modsec = std::make_unique<modsecurity::ModSecurity>();
137134
modsec->setConnectorInformation("ModSecurity-test v0.0.1-alpha" \
138135
" (ModSecurity test)");
139136
modsec->setServerLogCb(logCb, modsecurity::RuleMessageLogProperty
140137
| modsecurity::IncludeFullHighlightLogProperty);
141138

142-
rules = new modsecurity::RulesSet();
139+
auto rules = std::make_unique<modsecurity::RulesSet>();
143140
if (rules->loadFromUri(m_rules.c_str()) < 0) {
144141
std::cout << "Problems loading the rules..." << std::endl;
145142
std::cout << rules->m_parserError.str() << std::endl;
146143
return -1;
147144
}
148145

149-
dms.modsec = modsec;
150-
dms.rules = rules;
146+
dms.modsec = modsec.get();
147+
dms.rules = rules.get();
151148

152149
for (i = 0; i < NUM_THREADS; i++) {
153150
pthread_create(&threads[i], NULL, process_request,
154151
reinterpret_cast<void *>(&dms));
155-
// process_request((void *)&dms);
156152
}
157153

158154
usleep(10000);
@@ -162,8 +158,6 @@ class ReadingLogsViaRuleMessage {
162158
std::cout << "Main: completed thread id :" << i << std::endl;
163159
}
164160

165-
delete rules;
166-
delete modsec;
167161
return 0;
168162
}
169163

test/cppcheck_suppressions.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,5 +101,4 @@ stlcstrStream
101101
uselessCallsSubstr
102102

103103
// Examples
104-
memleak:examples/reading_logs_via_rule_message/reading_logs_via_rule_message.h:147
105104
memleak:examples/using_bodies_in_chunks/simple_request.cc

0 commit comments

Comments
 (0)