Skip to content

Fix LMDB compile error #1691

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

Fix LMDB compile error #1691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 7 additions & 10 deletions src/collection/backend/lmdb.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ namespace backend {
#ifdef WITH_LMDB


LMDB::LMDB() : m_env(NULL) {
LMDB::LMDB() : Collection(""), m_env(NULL) {
mdb_env_create(&m_env);
mdb_env_open(m_env, "./modsec-shared-collections",
MDB_WRITEMAP | MDB_NOSUBDIR, 0664);
Expand Down Expand Up @@ -262,7 +262,7 @@ bool LMDB::storeOrUpdateFirst(const std::string &key,


void LMDB::resolveSingleMatch(const std::string& var,
std::vector<const Variable *> *l) {
std::vector<const VariableValue *> *l) {
int rc;
MDB_txn *txn;
MDB_dbi dbi;
Expand Down Expand Up @@ -290,8 +290,7 @@ void LMDB::resolveSingleMatch(const std::string& var,
std::string *a = new std::string(
reinterpret_cast<char *>(mdb_value_ret.mv_data),
mdb_value_ret.mv_size);
Variable *v = new Variable(&var, a);
v->m_dynamic_value = true;
VariableValue *v = new VariableValue(&var, a);
l->push_back(v);
}

Expand Down Expand Up @@ -467,7 +466,7 @@ void LMDB::del(const std::string& key) {


void LMDB::resolveMultiMatches(const std::string& var,
std::vector<const Variable *> *l) {
std::vector<const VariableValue *> *l) {
MDB_val key, data;
MDB_txn *txn = NULL;
MDB_dbi dbi;
Expand Down Expand Up @@ -505,12 +504,11 @@ void LMDB::resolveMultiMatches(const std::string& var,
if (strncmp(var.c_str(), a, keySize) != 0) {
continue;
}
Variable *v = new Variable(
VariableValue *v = new VariableValue(
new std::string(reinterpret_cast<char *>(key.mv_data),
key.mv_size),
new std::string(reinterpret_cast<char *>(data.mv_data),
data.mv_size));
v->m_dynamic_value = true;
l->insert(l->begin(), v);
}

Expand All @@ -525,7 +523,7 @@ void LMDB::resolveMultiMatches(const std::string& var,


void LMDB::resolveRegularExpression(const std::string& var,
std::vector<const Variable *> *l) {
std::vector<const VariableValue *> *l) {
MDB_val key, data;
MDB_txn *txn = NULL;
MDB_dbi dbi;
Expand Down Expand Up @@ -599,12 +597,11 @@ void LMDB::resolveRegularExpression(const std::string& var,
continue;
}

Variable *v = new Variable(
VariableValue *v = new VariableValue(
new std::string(reinterpret_cast<char *>(key.mv_data),
key.mv_size),
new std::string(reinterpret_cast<char *>(data.mv_data),
data.mv_size));
v->m_dynamic_value = true;
l->insert(l->begin(), v);
}

Expand Down
6 changes: 3 additions & 3 deletions src/collection/backend/lmdb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ class LMDB :
std::unique_ptr<std::string> resolveFirst(const std::string& var) override;

void resolveSingleMatch(const std::string& var,
std::vector<const Variable *> *l) override;
std::vector<const VariableValue *> *l) override;
void resolveMultiMatches(const std::string& var,
std::vector<const Variable *> *l) override;
std::vector<const VariableValue *> *l) override;
void resolveRegularExpression(const std::string& var,
std::vector<const Variable *> *l) override;
std::vector<const VariableValue *> *l) override;

private:
void string2val(const std::string& str, MDB_val *val);
Expand Down