cosmetics: Address some cppcheck complains

This commit is contained in:
Felipe Zimmerle 2020-08-06 19:02:00 -03:00
parent 51d06d7a8e
commit ae3ad5eaa7
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
5 changed files with 7 additions and 7 deletions

View File

@ -38,7 +38,7 @@ bool DetectSQLi::evaluate(Transaction *t, RuleWithActions *rule,
ms_dbg_a(t, 4, "detected SQLi using libinjection with " \
"fingerprint '" + std::string(fingerprint) + "' at: '" +
input + "'");
if (rule && t && rule->hasCaptureAction()) {
if (rule && rule->hasCaptureAction()) {
t->m_collections.m_tx_collection->storeOrUpdateFirst(
"0", std::string(fingerprint));
ms_dbg_a(t, 7, "Added DetectSQLi match TX.0: " + \

View File

@ -34,7 +34,7 @@ bool DetectXSS::evaluate(Transaction *t, RuleWithActions *rule,
if (t) {
if (is_xss) {
ms_dbg_a(t, 5, "detected XSS using libinjection.");
if (rule && t && rule->hasCaptureAction()) {
if (rule && rule->hasCaptureAction()) {
t->m_collections.m_tx_collection->storeOrUpdateFirst(
"0", std::string(input));
ms_dbg_a(t, 7, "Added DetectXSS match TX.0: " + \

View File

@ -141,7 +141,7 @@ bool VerifyCC::evaluate(Transaction *t, RuleWithActions *rule,
int is_cc = luhnVerify(match.c_str(), match.size());
if (is_cc) {
if (t) {
if (rule && t && rule->hasCaptureAction()) {
if (rule && rule->hasCaptureAction()) {
t->m_collections.m_tx_collection->storeOrUpdateFirst(
"0", std::string(match));
ms_dbg_a(t, 7, "Added VerifyCC match TX.0: " + \

View File

@ -58,8 +58,8 @@ RuleWithOperator::RuleWithOperator(Operator *op,
std::unique_ptr<std::string> fileName,
int lineNumber)
: RuleWithActions(actions, transformations, std::move(fileName), lineNumber),
m_operator(op),
m_variables(_variables) { /* */ }
m_variables(_variables),
m_operator(op) { /* */ }
RuleWithOperator::~RuleWithOperator() {

View File

@ -50,7 +50,7 @@ namespace modsecurity {
int RulesSet::loadFromUri(const char *uri) {
Driver *driver = new Driver();
if (driver->parseFile(uri) == false) {
if (driver->parseFile(uri) == 0) {
m_parserError << driver->m_parserError.str();
delete driver;
return -1;
@ -66,7 +66,7 @@ int RulesSet::loadFromUri(const char *uri) {
int RulesSet::load(const char *file, const std::string &ref) {
Driver *driver = new Driver();
if (driver->parse(file, ref) == false) {
if (driver->parse(file, ref) == 0) {
m_parserError << driver->m_parserError.str();
delete driver;
return -1;