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

Fix pcre_exec matched string

Browse Source
This commit is contained in:
Felipe Zimmerle 2015-10-16 16:15:39 -03:00
parent 0285c944f9
commit c800214e6d
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/operators/rx.cc
View File

@ -30,8 +30,7 @@ bool Rx::evaluate(Assay *assay, const std::string& input) {
SMatch match;
if (regex_search(input, &match, *m_re) && match.size() >= 1) {
std::cout << "wheee" << std::endl;
// this->matched.push_back(match.match);
this->matched.push_back(match.match);
return true;
}

9
src/utils/regex.cc
View File

@ -48,8 +48,15 @@ Regex::Regex(const std::string& pattern_)
int regex_search(const std::string& s, SMatch *match,
const Regex& regex) {
int ovector[OVECCOUNT];
return pcre_exec(regex.m_pc, regex.m_pce, s.c_str(),
int ret = pcre_exec(regex.m_pc, regex.m_pce, s.c_str(),
s.size(), 0, 0, ovector, OVECCOUNT) > 0;
if (ret > 0) {
match->match = std::string(s, ovector[2], ovector[3] - ovector[2]);
match->size_ = ret;
}
return ret;
}
int regex_search(const std::string& s, const Regex& regex) {