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

Optimization on the macro expansion function

Browse Source
This commit is contained in:
Felipe Zimmerle
2017-07-07 23:51:20 -03:00
parent 53ff0e1a57
commit 9a41942ce1
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/macro_expansion.cc
View File

@@ -62,6 +62,7 @@ std::string MacroExpansion::expand(const std::string& input,
while (pos != std::string::npos) { while (pos != std::string::npos) {
size_t start = pos; size_t start = pos;
size_t end = res.find("}"); size_t end = res.find("}");
size_t new_pos = start;
if (end == std::string::npos) { if (end == std::string::npos) {
return res; return res;
} }
@@ -313,9 +314,13 @@ std::string MacroExpansion::expand(const std::string& input,
if (variableValue != NULL) { if (variableValue != NULL) {
res.insert(start, *variableValue); res.insert(start, *variableValue);
new_pos = new_pos + (*variableValue).length();
}
if (new_pos + 3 >= res.length()) {
break;
} }
pos = res.find("%{"); pos = res.find("%{", new_pos);
} }
return res; return res;