github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-16 07:56:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Replace C pointers by shared pointer in fuzzy_hash op code

Browse Source
This commit is contained in:
Ervin Hegedus 2025-03-12 22:09:51 +01:00
parent d3c1ad7177
commit dbdd6318ff
No known key found for this signature in database
GPG Key ID: 5FA5BC3F5EC41F61
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/operators/fuzzy_hash.cc
View File

@ -28,7 +28,7 @@ bool FuzzyHash::init(const std::string &param2, std::string *error) {
std::string digit; std::string digit;
std::string file; std::string file;
std::istream *iss; std::istream *iss;
struct fuzzy_hash_chunk *chunk, *t; std::shared_ptr<fuzzy_hash_chunk> chunk, t;
std::string err; std::string err;
auto pos = m_param.find_last_of(' '); 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); ) { for (std::string line; std::getline(*iss, line); ) {
chunk = (struct fuzzy_hash_chunk *)calloc(1, chunk = std::make_shared<fuzzy_hash_chunk>();
sizeof(struct fuzzy_hash_chunk));
chunk->data = strdup(line.c_str()); chunk->data = std::shared_ptr<char>(strdup(line.c_str()), free);
chunk->next = NULL; chunk->next = nullptr;
if (m_head == NULL) { if (m_head == NULL) {
m_head = chunk; m_head = chunk;
@ -84,22 +83,15 @@ bool FuzzyHash::init(const std::string &param2, std::string *error) {
} }
FuzzyHash::~FuzzyHash() { 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) { bool FuzzyHash::evaluate(Transaction *t, const std::string &str) {
#ifdef WITH_SSDEEP #ifdef WITH_SSDEEP
char result[FUZZY_MAX_RESULT]; 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(), if (fuzzy_hash_buf((const unsigned char*)str.c_str(),
str.size(), result)) { str.size(), result)) {
@ -108,7 +100,7 @@ bool FuzzyHash::evaluate(Transaction *t, const std::string &str) {
} }
while (chunk != NULL) { while (chunk != NULL) {
int i = fuzzy_compare(chunk->data, result); int i = fuzzy_compare(chunk->data.get(), result);
if (i >= m_threshold) { if (i >= m_threshold) {
ms_dbg_a(t, 4, "Fuzzy hash: matched " \ ms_dbg_a(t, 4, "Fuzzy hash: matched " \
"with score: " + std::to_string(i) + "."); "with score: " + std::to_string(i) + ".");

6
src/operators/fuzzy_hash.h
View File

@ -31,8 +31,8 @@ namespace operators {
struct fuzzy_hash_chunk { struct fuzzy_hash_chunk {
char *data; std::shared_ptr<char> data;
struct fuzzy_hash_chunk *next; std::shared_ptr<fuzzy_hash_chunk> next;
}; };
class FuzzyHash : public Operator { class FuzzyHash : public Operator {
@ -49,7 +49,7 @@ class FuzzyHash : public Operator {
bool init(const std::string &param, std::string *error) override; bool init(const std::string &param, std::string *error) override;
private: private:
int m_threshold; int m_threshold;
struct fuzzy_hash_chunk *m_head; std::shared_ptr<fuzzy_hash_chunk> m_head;
}; };
} // namespace operators } // namespace operators