github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-30 11:44:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3070 from owasp-modsecurity/revert-2960-v2/mst/mem_leak1

Browse Source 
Revert "Fixed 2 memory leaks"
This commit is contained in:
Ervin Hegedus
2024-02-07 23:09:14 +01:00
committed by GitHub
parent feea267c79 7828c63205
commit 0114a4f6eb
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
apache2/re.c
View File

@@ -378,7 +378,7 @@ char *update_rule_target_ex(modsec_rec *msr, msre_ruleset *ruleset, msre_rule *r
} }
#if !defined(MSC_TEST) #if !defined(MSC_TEST)
else { else {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, " ModSecurity: Cannot find variable to replace"); ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, " ModSecurity: Cannot find varibale to replace");
} }
#endif #endif
goto end; goto end;
@@ -386,13 +386,8 @@ char *update_rule_target_ex(modsec_rec *msr, msre_ruleset *ruleset, msre_rule *r
} else { } else {
target = strdup(p); target = strdup(p);
if(target == NULL) { if(target == NULL)
if(target_list != NULL)
free(target_list);
if(replace != NULL)
free(replace);
return NULL; return NULL;
}
is_negated = is_counting = 0; is_negated = is_counting = 0;
param = name = value = NULL; param = name = value = NULL;
@@ -426,8 +421,6 @@ char *update_rule_target_ex(modsec_rec *msr, msre_ruleset *ruleset, msre_rule *r
free(target_list); free(target_list);
if(replace != NULL) if(replace != NULL)
free(replace); free(replace);
if(target != NULL)
free(target);
if(msr) { if(msr) {
msr_log(msr, 9, "Error to update target - [%s] is not valid target", name); msr_log(msr, 9, "Error to update target - [%s] is not valid target", name);
} }
@@ -519,12 +512,18 @@ char *update_rule_target_ex(modsec_rec *msr, msre_ruleset *ruleset, msre_rule *r
} }
end: end:
if(target_list != NULL) if(target_list != NULL) {
free(target_list); free(target_list);
if(replace != NULL) target_list = NULL;
}
if(replace != NULL) {
free(replace); free(replace);
if(target != NULL) replace = NULL;
}
if(target != NULL) {
free(target); free(target);
target = NULL;
}
return NULL; return NULL;
} }