Skip to content

fix: align code to fix cppcheck errors #3350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 14, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/multiprocess_c/multi.c
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ RulesSet *rules = NULL;
ModSecurity *modsec = NULL;


void process_special_request (int j) {
static void process_special_request (int j) {
Transaction *transaction;
transaction = msc_new_transaction(modsec, rules, NULL);

@@ -60,7 +60,7 @@ void process_special_request (int j) {
msc_transaction_cleanup(transaction);
}

void process_request (int j) {
static void process_request (int j) {
int i;

for (i = 0; i < REQUESTS_PER_PROCESS; i++) {
4 changes: 2 additions & 2 deletions headers/modsecurity/rules_exceptions.h
Original file line number Diff line number Diff line change
@@ -53,8 +53,8 @@ class RulesExceptions {
bool contains(int a);
bool merge(RulesExceptions *from);

bool loadRemoveRuleByMsg(const std::string &msg, std::string *error);
bool loadRemoveRuleByTag(const std::string &msg, std::string *error);
bool loadRemoveRuleByMsg(const std::string &msg, const std::string *error);
bool loadRemoveRuleByTag(const std::string &msg, const std::string *error);

bool loadUpdateTargetByMsg(const std::string &msg,
std::unique_ptr<std::vector<std::unique_ptr<variables::Variable> > > v,
2 changes: 1 addition & 1 deletion src/actions/transformations/utf8_to_unicode.cc
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ static inline bool encode(std::string &value) {
int unicode_len = 0;
unsigned int d = 0;
unsigned char c;
auto utf = &input[i];
const auto* utf = &input[i];

c = *utf;

27 changes: 7 additions & 20 deletions src/operators/fuzzy_hash.cc
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ bool FuzzyHash::init(const std::string &param2, std::string *error) {
std::string digit;
std::string file;
std::istream *iss;
struct fuzzy_hash_chunk *chunk, *t;
std::shared_ptr<fuzzy_hash_chunk> chunk, t;
std::string err;

auto pos = m_param.find_last_of(' ');
@@ -55,11 +55,10 @@ bool FuzzyHash::init(const std::string &param2, std::string *error) {
}

for (std::string line; std::getline(*iss, line); ) {
chunk = (struct fuzzy_hash_chunk *)calloc(1,
sizeof(struct fuzzy_hash_chunk));
chunk = std::make_shared<fuzzy_hash_chunk>();

chunk->data = strdup(line.c_str());
chunk->next = NULL;
chunk->data = std::shared_ptr<char>(strdup(line.c_str()), free);
chunk->next = nullptr;

if (m_head == NULL) {
m_head = chunk;
@@ -83,23 +82,11 @@ bool FuzzyHash::init(const std::string &param2, std::string *error) {
#endif
}

FuzzyHash::~FuzzyHash() {
struct fuzzy_hash_chunk *c = m_head;
while (c) {
struct fuzzy_hash_chunk *t = c;
free(c->data);
c->data = NULL;
c = c->next;
free(t);
}
m_head = NULL;
}


bool FuzzyHash::evaluate(Transaction *t, const std::string &str) {
#ifdef WITH_SSDEEP
char result[FUZZY_MAX_RESULT];
struct fuzzy_hash_chunk *chunk = m_head;
std::shared_ptr<fuzzy_hash_chunk> chunk = m_head;


if (fuzzy_hash_buf((const unsigned char*)str.c_str(),
str.size(), result)) {
@@ -108,7 +95,7 @@ bool FuzzyHash::evaluate(Transaction *t, const std::string &str) {
}

while (chunk != NULL) {
int i = fuzzy_compare(chunk->data, result);
int i = fuzzy_compare(chunk->data.get(), result);
if (i >= m_threshold) {
ms_dbg_a(t, 4, "Fuzzy hash: matched " \
"with score: " + std::to_string(i) + ".");
8 changes: 4 additions & 4 deletions src/operators/fuzzy_hash.h
Original file line number Diff line number Diff line change
@@ -31,8 +31,8 @@ namespace operators {


struct fuzzy_hash_chunk {
char *data;
struct fuzzy_hash_chunk *next;
std::shared_ptr<char> data;
std::shared_ptr<fuzzy_hash_chunk> next;
};

class FuzzyHash : public Operator {
@@ -42,14 +42,14 @@ class FuzzyHash : public Operator {
: Operator("FuzzyHash", std::move(param)),
m_threshold(0),
m_head(NULL) { }
~FuzzyHash() override;
~FuzzyHash() override = default;

bool evaluate(Transaction *transaction, const std::string &std) override;

bool init(const std::string &param, std::string *error) override;
private:
int m_threshold;
struct fuzzy_hash_chunk *m_head;
std::shared_ptr<fuzzy_hash_chunk> m_head;
};

} // namespace operators
2 changes: 1 addition & 1 deletion src/request_body_processor/multipart.cc
Original file line number Diff line number Diff line change
@@ -1638,7 +1638,7 @@ bool Multipart::process(const std::string& data, std::string *error,
}
} else { /* It looks like a boundary but */
/* we couldn't match it. */
char *p = NULL;
const char *p = NULL;

/* Check if an attempt to use quotes around the
* boundary was made. */
4 changes: 2 additions & 2 deletions src/rules_exceptions.cc
Original file line number Diff line number Diff line change
@@ -58,15 +58,15 @@ bool RulesExceptions::loadUpdateActionById(double id,


bool RulesExceptions::loadRemoveRuleByMsg(const std::string &msg,
std::string *error) {
const std::string *error) {
m_remove_rule_by_msg.push_back(msg);

return true;
}


bool RulesExceptions::loadRemoveRuleByTag(const std::string &msg,
std::string *error) {
const std::string *error) {
m_remove_rule_by_tag.push_back(msg);

return true;