Skip to content

Fix memory leak in setvar when the current value is not numeric #3635

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

Open
tomsommer wants to merge 1 commit into
base: v3/master
Choose a base branch
from
+66 −1
Open

Fix memory leak in setvar when the current value is not numeric #3635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/actions/set_var.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,13 @@ bool SetVar::evaluate(RuleWithActions *rule, Transaction *t) {
if (l.size() == 0) {
value = 0;
} else {
value = stoi(l[0]->getValue());
/* copy: the VariableValue objects are deleted below */
// cppcheck-suppress redundantCopyLocalConst
const std::string currentValue(l[0]->getValue());
for (auto &i : l) {
delete i;
}
value = stoi(currentValue);
}
} catch (...) {
value = 0;
Expand Down
62 changes: 62 additions & 0 deletions test/test-cases/regression/collection-tx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,5 +347,67 @@
"SecRule REQUEST_HEADERS:Cookie|REQUEST_HEADERS:Cookie2 \"@contains ookie\" \"id:4,t:lowercase,t:removewhitespace,multimatch,setvar:tx.anomaly_score=+%{tx.critical_anomaly_score}\"",
"SecRule TX \"@contains to_test\" \"id:100\""
]
},
{
"enabled": 1,
"version_min": 300000,
"version_max": 0,
"title": "Testing collection :: TX (6/n)",
"client": {
"ip": "200.249.12.31",
"port": 2313
},
"server": {
"ip": "200.249.12.31",
"port": 80
},
"request": {
"headers": {
"User-Agent": "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.5) Gecko/20091102 Firefox/3.5.5 (.NET CLR 3.5.30729)",
"Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
"Accept-Language": "en-us,en;q=0.5",
"Accept-Encoding": "gzip,deflate",
"Accept-Charset": "ISO-8859-1,utf-8;q=0.7,*;q=0.7",
"Keep-Alive": "300",
"Connection": "keep-alive",
"Cookie": "PHPSESSID=rAAAAAAA2t5uvjq435r4q7ib3vtdjq120 - cookie I",
"Cookie2": "PHPSESSID=rAAAAAAA2t5uvjq435r4q7ib3vtdjq120 - cookie II",
"Pragma": "no-cache",
"Cache-Control": "no-cache",
"Content-Length": "0"
},
"uri": "/test.pl?param1= test &param2=test2",
"method": "GET",
"http_version": 1.1,
"body": [
""
]
},
"response": {
"headers": {
"Content-Type": "text/xml; charset=utf-8\n\r",
"Content-Length": "384"
},
"body": [
"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n\r",
"<soap:Envelope xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">\n\r",
" <soap:Body>\n\r",
" <EnlightenResponse xmlns=\"http://clearforest.com/\">\n\r",
" <EnlightenResult>string</EnlightenResult>\n\r",
" </EnlightenResponse>\n\r",
" </soap:Body>\n\r",
"</soap:Envelope>\n\r"
]
},
"expected": {
"debug_log": "Target value: \"10\" \\(Variable: TX:something\\)",
"http_code": 200
},
"rules": [
"SecRuleEngine On",
"SecRule REQUEST_HEADERS:Cookie \"@contains PHPSESSID\" \"id:1,t:none,setvar:tx.something=not_a_number\"",
"SecRule REQUEST_HEADERS:Cookie \"@contains PHPSESSID\" \"id:2,t:none,setvar:tx.something=+10\"",
"SecRule TX \"@contains to_test\" \"id:3,t:lowercase,t:none\""
]
}
]
Loading