From 7feafddd040c93e2f3bca65c7c87973769d37c2d Mon Sep 17 00:00:00 2001
From: Kristof Szabados <Kristof.Szabados@ericsson.com>
Date: Thu, 9 Jan 2020 14:31:01 +0100
Subject: [PATCH] fix memoryleaks in JUnitLogge rand JUnitLogger2
This is likely a copy+paste mistake that has been lurking around
for quite some time.
(fix originally made by Harald Welte)
Signed-off-by: Kristof Szabados <Kristof.Szabados@ericsson.com>
---
loggerplugins/JUnitLogger/JUnitLogger.cc | 2 +-
loggerplugins/JUnitLogger2/JUnitLogger2.cc | 9 +--------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/loggerplugins/JUnitLogger/JUnitLogger.cc b/loggerplugins/JUnitLogger/JUnitLogger.cc
index a572e282e..c1db1c2ac 100644
--- a/loggerplugins/JUnitLogger/JUnitLogger.cc
+++ b/loggerplugins/JUnitLogger/JUnitLogger.cc
@@ -86,7 +86,7 @@ void JUnitLogger::set_parameter(
Free(filename_stem_);
filename_stem_ = mcopystr(parameter_value);
} else if (!strcmp("testsuite_name", parameter_name)) {
- if (filename_stem_ != NULL)
+ if (testsuite_name_ != NULL)
Free(testsuite_name_);
testsuite_name_ = mcopystr(parameter_value);
} else {
diff --git a/loggerplugins/JUnitLogger2/JUnitLogger2.cc b/loggerplugins/JUnitLogger2/JUnitLogger2.cc
index 5c921e5ca..b60541120 100644
--- a/loggerplugins/JUnitLogger2/JUnitLogger2.cc
+++ b/loggerplugins/JUnitLogger2/JUnitLogger2.cc
@@ -83,7 +83,7 @@ void JUnitLogger2::set_parameter(const char *parameter_name, const char *paramet
Free(filename_stem_);
filename_stem_ = mcopystr(parameter_value);
} else if (!strcmp("testsuite_name", parameter_name)) {
- if (filename_stem_ != NULL)
+ if (testsuite_name_ != NULL)
Free(testsuite_name_);
testsuite_name_ = mcopystr(parameter_value);
} else {
@@ -236,13 +236,6 @@ void TestCase::writeTestCase(FILE* file_stream_) const{
fprintf(file_stream_, " <error type='DTE'>%s</error>\n", dte_reason.data());
fprintf(file_stream_, " </testcase>\n");
break; }
- case Inconc: {
- fprintf(file_stream_, " <testcase classname='%s' name='%s' time='%f'>\n", module_name.data(), tc_name.data(), time);
- fprintf(file_stream_, " <failure type='inconclusive-verdict'>%s\n", reason.data());
- fprintf(file_stream_, "%s\n", stack_trace.data());
- fprintf(file_stream_, " </failure>\n");
- fprintf(file_stream_, " </testcase>\n");
- break; }
default:
fprintf(file_stream_, " <testcase classname='%s' name='%s' time='%f'/>\n", module_name.data(), tc_name.data(), time);
break;
--
GitLab