Skip to content

fix: Sonarcloud memleak fixes #3114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Aug 8, 2024
Merged

fix: Sonarcloud memleak fixes #3114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
39848e5
Fix memleak in regression.cc
airween Mar 27, 2024
5b2404e
Fix memleak in rules-check.cc
airween Mar 27, 2024
4085ff5
Replace putenv by setenv
airween Mar 27, 2024
ca7c0ae
Code refactorization
airween Mar 27, 2024
1b6b631
Use make_unique to create unique ptr
airween Mar 27, 2024
cdb6b83
Replaced variable type to 'auto'
airween Mar 27, 2024
8280175
Merge branch 'v3/master' into v3/sonarmemleakfix
airween Aug 5, 2024
6cffa8f
Add _putenv() in case of WIN32 port instead of setenv()
airween Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions test/regression/regression.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,9 +480,14 @@ int main(int argc, char **argv) {
ModSecurityTest<RegressionTest> test;

std::string ver(MODSECURITY_VERSION);
std::string envvar("MODSECURITY=ModSecurity " + ver + " regression tests");
std::string envvar("ModSecurity " + ver + " regression tests");

#ifndef WIN32
setenv("MODSECURITY", envvar.c_str(), 1);
#else
_putenv_s("MODSECURITY", envvar.c_str());
#endif

putenv(strdup(envvar.c_str()));
#ifndef NO_LOGS
int test_number = 0;
#endif
Expand Down
44 changes: 13 additions & 31 deletions tools/rules-check/rules-check.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ void print_help(const char *name) {


int main(int argc, char **argv) {
modsecurity::RulesSet *rules;
auto rules = std::make_unique<modsecurity::RulesSet>();
char **args = argv;
rules = new modsecurity::RulesSet();
int ret = 0;

args++;
Expand All @@ -50,41 +49,26 @@ int main(int argc, char **argv) {

while (*args != NULL) {
struct stat buffer;
std::string argFull("");
const char *arg = *args;
std::string arg = *args;
std::string err;
int r;

if (argFull.empty() == false) {
if (arg[strlen(arg)-1] == '\"') {
argFull.append(arg, strlen(arg)-1);
goto next;
} else {
argFull.append(arg);
goto next;
}
}

if (arg[0] == '\"' && argFull.empty() == true) {
if (arg[strlen(arg)-1] == '\"') {
argFull.append(arg+1, strlen(arg) - 2);
} else {
argFull.append(arg+1);
goto next;
}
}
// strip arg from leading and trailing '"' chars
arg.erase(arg.find_last_not_of('\"')+1);
arg.erase(0, arg.find_first_not_of('\"'));

if (argFull.empty() == false) {
arg = strdup(argFull.c_str());
argFull.clear();
if (arg.empty() == true) {
args++;
continue;
}

std::cout << " : " << arg << " -- ";
if (stat(arg, &buffer) == 0) {
r = rules->loadFromUri(arg);
if (stat(arg.c_str(), &buffer) == 0) {
r = rules->loadFromUri(arg.c_str());
} else {
r = rules->load(arg);
r = rules->load(arg.c_str());
}

if (r < 0) {
err.assign(rules->m_parserError.str());
rules->m_parserError.str("");
Expand All @@ -95,12 +79,10 @@ int main(int argc, char **argv) {
if (err.empty() == false) {
std::cerr << " " << err << std::endl;
}
next:

args++;
}

delete rules;

if (ret < 0) {
std::cout << "Test failed." << std::endl;
} else {
Expand Down
Loading