Cosmetics: address cppcheck warnings

test/common/modsecurity_test.cc

@@ -78,8 +78,8 @@ bool ModSecurityTest<T>::load_test_json(std::string file) {
         if (this->count(u->filename + ":" + u->name) == 0) {
             std::vector<T *> *vector = new std::vector<T *>;
             vector->push_back(u);
-            std::pair<std::string, std::vector<T *> *> a(u->filename + ":" +
-                u->name, vector);
+            std::string filename(u->filename + ":" + u->name);
+            std::pair<std::string, std::vector<T*>*> a(filename, vector);
             this->insert(a);
         } else {
             std::vector<T *> *vec = this->at(u->filename + ":" + u->name);

test/cppcheck_suppressions.txt

@@ -1,11 +1,6 @@
-constStatement:test/common/modsecurity_test.cc:81
-duplicateCondition:src/utils/geo_lookup.cc:82
-initializerList:src/actions/action.h:90
-initializerList:src/actions/action.h:91
-invalidScanfArgType_int:src/rules_properties.cc
-knownConditionTrueFalse:test/regression/regression.cc:453
-leakReturnValNotUsed:src/debug_log_writer_agent.cc:31
-nullPointerRedundantCheck:src/utils/msc_tree.cc:654
+//
+// Ignore libinjection related stuff.
+//
 *:others/libinjection/src/libinjection_html5.c
 *:others/libinjection/src/libinjection_sqli.c
 *:others/libinjection/src/libinjection_xss.c
@@ -14,64 +9,55 @@ nullPointerRedundantCheck:src/utils/msc_tree.cc:654
 *:others/libinjection/src/testdriver.c
 *:others/libinjection/src/test_speed_sqli.c
 *:others/libinjection/src/test_speed_xss.c
+
+
+//
+// Lets ignore mbedtls.
+//
 *:others/mbedtls/base64.c
 *:others/mbedtls/md5.c
 *:others/mbedtls/sha1.c
-*:parser/seclang-parser.hh
-*:parser/seclang-scanner.cc
-passedByValue:src/variables/time.h:34
-postfixOperator:*
-readdirCalled:test/common/modsecurity_test.cc:114
-*:seclang-parser.tab.hh
-*:seclang-scanner.cc
-*:seclang-scanner.ll
+
+
+//
+// Code imported from ModSecurity v2...
+//
 shiftNegative:src/utils/msc_tree.cc
-*:src/parser/seclang-parser.cc
-*:src/parser/seclang-parser.hh
-*:src/parser/seclang-scanner.cc
-*:src/seclang-scanner.cc
 *:src/utils/acmp.cc
 *:src/utils/msc_tree.cc
-*:test/benchmark/owasp-v3/util/av-scanning/runAV/*
-unreadVariable:test/regression/regression.cc:380
-unusedFunction:src/macro_expansion.cc
-unusedFunction:src/modsecurity.cc
-unusedFunction:src/rules.cc
-unusedFunction:src/transaction.cc
-unusedFunction:src/utils.cc
-unusedFunction:src/utils/mbedtls/base64.c
-unusedFunction:src/utils/mbedtls/md5.c
-unusedFunction:src/utils/mbedtls/sha1.c
-unusedFunction:src/utils/msc_tree.cc
-unusedFunction:src/utils/string.cc
-unusedFunction:test/optimization/optimization.cc
-unusedFunction:test/regression/regression_test.cc
-unusedFunction:test/unit/unit_test.cc:33
-unusedLabel:src/unique_id.cc:222
-unusedLabel:src/unique_id.cc:224
-useStlAlgorithm:src/rule.cc
-useStlAlgorithm:src/rules_exceptions.cc:193
-useStlAlgorithm:src/rules_exceptions.cc:199
-useStlAlgorithm:src/utils/shared_files.cc:41
-useStlAlgorithm:test/regression/regression.cc:493
-useStlAlgorithm:test/unit/unit.cc:174
-useStlAlgorithm:test/unit/unit.cc:209
-unusedFunction
-funcArgNamesDifferent
-preprocessorErrorDirective
-useStlAlgorithm
-functionStatic:test/regression/regression_test.h:36
-missingInclude
-toomanyconfigs
-functionStatic:src/unique_id.h:49
-functionStatic:src/unique_id.h:50
-functionConst:src/utils/geo_lookup.h:49
-functionStatic:headers/modsecurity/transaction.h:374
+invalidScanfArgType_int:src/rules_properties.cc:102
+invalidScanfArgType_int:src/rules_properties.cc:103
 
 
-functionStatic:src/operators/geo_lookup.h:35
-useInitializationList:src/operators/rbl.h:69
-
+// 
+// ModSecurity v3 code...
+// 
 unmatchedSuppression:src/utils/geo_lookup.cc:82
 useInitializationList:src/utils/shared_files.h:87
 unmatchedSuppression:src/utils/msc_tree.cc
+functionStatic:headers/modsecurity/transaction.h:373
+duplicateBranch:src/audit_log/audit_log.cc:224
+unreadVariable:src/request_body_processor/multipart.cc:391
+stlcstrParam:src/audit_log/writer/parallel.cc:145
+functionStatic:src/engine/lua.h:71
+functionStatic:src/engine/lua.h:72
+functionConst:src/utils/geo_lookup.h:49
+useInitializationList:src/operators/rbl.h:69
+constStatement:test/common/modsecurity_test.cc:82
+danglingTemporaryLifetime:src/modsecurity.cc:204
+functionStatic:src/operators/geo_lookup.h:35
+duplicateBreak:src/operators/validate_utf8_encoding.cc
+duplicateBranch:src/request_body_processor/multipart.cc:91
+syntaxError:src/transaction.cc:62
+noConstructor:src/variables/variable.h:152
+
+
+
+
+unusedFunction
+missingIncludeSystem
+useStlAlgorithm
+preprocessorErrorDirective
+funcArgNamesDifferent
+unmatchedSuppression
+missingInclude

test/regression/regression_test.cc

@@ -23,7 +23,7 @@
 
 namespace modsecurity_test {
 
-const std::string RegressionTest::print() {
+std::string RegressionTest::print() {
     std::stringstream i;
 
 #if 0

test/regression/regression_test.h

@@ -33,7 +33,7 @@ class RegressionTest {
  public:
     static RegressionTest *from_yajl_node(const yajl_val &);
 
-    const std::string print();
+    static std::string print();
     std::string filename;
     std::string name;
     std::string title;

test/unit/unit_test.cc

@@ -66,7 +66,7 @@ void json2bin(std::string *str) {
         unsigned int p;
         std::string toBeReplaced = match.str();
         toBeReplaced.erase(0, 2);
-        sscanf(toBeReplaced.c_str(), "%x", &p);
+        sscanf(toBeReplaced.c_str(), "%3x", &p);
         replaceAll(str, match.str(), p);
     }