Fix the regression tests as reported on #1142

owasp-modsecurity · May 5, 2016 · d0e0002 · d0e0002
1 parent 3062ff2
commit d0e0002
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/operators/contains.cc b/src/operators/contains.cc
@@ -26,7 +26,7 @@ bool Contains::evaluate(Transaction *transaction, const std::string &input) {
     std::string p = MacroExpansion::expand(param, transaction);
     bool contains = input.find(p) != std::string::npos;
 
-    if (contains) {
+    if (contains && transaction) {
         transaction->m_matched.push_back(p);
     }
 

diff --git a/src/operators/pm.cc b/src/operators/pm.cc
@@ -77,7 +77,7 @@ bool Pm::evaluate(Transaction *transaction, const std::string &input) {
     const char *match = NULL;
 
     rc = acmp_process_quick(&pt, &match, input.c_str(), input.length());
-    if (rc == 1) {
+    if (rc == 1 && transaction) {
         transaction->m_matched.push_back(std::string(match));
     }
 

diff --git a/src/operators/rx.cc b/src/operators/rx.cc
@@ -29,8 +29,14 @@ namespace operators {
 bool Rx::evaluate(Transaction *transaction, const std::string& input) {
     SMatch match;
 
+    if (m_param.empty()) {
+        return true;
+    }
+
     if (regex_search(input, &match, *m_re) && match.size() >= 1) {
-        transaction->m_matched.push_back(match.match);
+        if (transaction) {
+            transaction->m_matched.push_back(match.match);
+        }
         return true;
     }