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

Prevent segfault for #2755

Browse Source 
Make transactions no-op if the file handle is invalid
This commit is contained in:
Danila Vershinin 2022-06-09 18:10:26 +03:00
parent 97550881fe
commit 204908cf50
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/collection/backend/lmdb.cc
View File

@ -46,7 +46,12 @@ int LMDB::txn_begin(unsigned int flags, MDB_txn **ret) {
m_dbi = *(MDBEnvProvider::GetInstance().GetDBI()); m_dbi = *(MDBEnvProvider::GetInstance().GetDBI());
isOpen = true; isOpen = true;
} }
return mdb_txn_begin(m_env, NULL, flags, ret);
if (MDBEnvProvider::GetInstance().isValid()) {
return mdb_txn_begin(m_env, NULL, flags, ret);
} else {
return -1;
}
} }
void LMDB::string2val(const std::string& str, MDB_val *val) { void LMDB::string2val(const std::string& str, MDB_val *val) {
@ -501,14 +506,19 @@ end_txn:
} }
MDBEnvProvider::MDBEnvProvider() : m_env(NULL) { MDBEnvProvider::MDBEnvProvider() : m_env(NULL), valid(false) {
int rc;
MDB_txn *txn; MDB_txn *txn;
mdb_env_create(&m_env); mdb_env_create(&m_env);
mdb_env_open(m_env, "./modsec-shared-collections", rc = mdb_env_open(m_env, "./modsec-shared-collections",
MDB_WRITEMAP | MDB_NOSUBDIR, 0664); MDB_WRITEMAP | MDB_NOSUBDIR, 0664);
mdb_txn_begin(m_env, NULL, 0, &txn);
mdb_dbi_open(txn, NULL, MDB_CREATE | MDB_DUPSORT, &m_dbi); if (rc == 0) {
mdb_txn_commit(txn); valid = true;
mdb_txn_begin(m_env, NULL, 0, &txn);
mdb_dbi_open(txn, NULL, MDB_CREATE | MDB_DUPSORT, &m_dbi);
mdb_txn_commit(txn);
}
} }
MDB_env* MDBEnvProvider::GetEnv() { MDB_env* MDBEnvProvider::GetEnv() {
@ -519,6 +529,10 @@ MDB_dbi* MDBEnvProvider::GetDBI() {
return &m_dbi; return &m_dbi;
} }
bool MDBEnvProvider::isValid() {
return valid;
}
MDBEnvProvider::~MDBEnvProvider() { MDBEnvProvider::~MDBEnvProvider() {
mdb_dbi_close(m_env, m_dbi); mdb_dbi_close(m_env, m_dbi);
mdb_env_close(m_env); mdb_env_close(m_env);

3
src/collection/backend/lmdb.h
View File

@ -83,10 +83,13 @@ class MDBEnvProvider {
} }
MDB_env* GetEnv(); MDB_env* GetEnv();
MDB_dbi* GetDBI(); MDB_dbi* GetDBI();
bool isValid();
~MDBEnvProvider(); ~MDBEnvProvider();
private: private:
MDB_env *m_env; MDB_env *m_env;
MDB_dbi m_dbi; MDB_dbi m_dbi;
bool valid;
MDBEnvProvider(); MDBEnvProvider();
}; };