github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-13 21:36:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix macro expansion: no more % abandoned by the end of variable

Browse Source
This commit is contained in:
Felipe Zimmerle 2016-05-06 14:16:37 -03:00
parent 5728110272
commit 33a704e918
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/macro_expansion.cc
View File

@ -62,11 +62,11 @@ std::string MacroExpansion::expand(const std::string& input,
variableValue = transaction->m_collections.resolveFirst(col, var); variableValue = transaction->m_collections.resolveFirst(col, var);
} }
if (res[end - start + 2] == '%') { res.erase(start, end - start + 1);
res.erase(start, end - start + 1); if (res[start] == '%') {
} else { res.erase(start, 1);
res.erase(start, end - start + 2);
} }
if (variableValue != NULL) { if (variableValue != NULL) {
res.insert(start, *variableValue); res.insert(start, *variableValue);
} }