foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-10 10:52:31 -05:00
Code Issues Activity

Move SafeDbt out of BerkeleyBatch

Browse source
This commit is contained in:
Andrew Chow 2022-04-11 14:49:46 -04:00 • committed by Andrew Chow
parent 6061eb6564
commit 69efbc011b
2 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/wallet/bdb.cpp
View file

@ -220,17 +220,17 @@ BerkeleyEnvironment::BerkeleyEnvironment() : m_use_shared_memory(false)
fMockDb = true; fMockDb = true;
} }
BerkeleyBatch::SafeDbt::SafeDbt() SafeDbt::SafeDbt()
{ {
m_dbt.set_flags(DB_DBT_MALLOC); m_dbt.set_flags(DB_DBT_MALLOC);
} }
BerkeleyBatch::SafeDbt::SafeDbt(void* data, size_t size) SafeDbt::SafeDbt(void* data, size_t size)
: m_dbt(data, size) : m_dbt(data, size)
{ {
} }
BerkeleyBatch::SafeDbt::~SafeDbt() SafeDbt::~SafeDbt()
{ {
if (m_dbt.get_data() != nullptr) { if (m_dbt.get_data() != nullptr) {
// Clear memory, e.g. in case it was a private key // Clear memory, e.g. in case it was a private key
@ -244,17 +244,17 @@ BerkeleyBatch::SafeDbt::~SafeDbt()
} }
} }
const void* BerkeleyBatch::SafeDbt::get_data() const const void* SafeDbt::get_data() const
{ {
return m_dbt.get_data(); return m_dbt.get_data();
} }
uint32_t BerkeleyBatch::SafeDbt::get_size() const uint32_t SafeDbt::get_size() const
{ {
return m_dbt.get_size(); return m_dbt.get_size();
} }
BerkeleyBatch::SafeDbt::operator Dbt*() SafeDbt::operator Dbt*()
{ {
return &m_dbt; return &m_dbt;
} }

14
src/wallet/bdb.h
View file

@ -165,15 +165,12 @@ public:
std::unique_ptr<DatabaseBatch> MakeBatch(bool flush_on_close = true) override; std::unique_ptr<DatabaseBatch> MakeBatch(bool flush_on_close = true) override;
}; };
/** RAII class that provides access to a Berkeley database */ /** RAII class that automatically cleanses its data on destruction */
class BerkeleyBatch : public DatabaseBatch class SafeDbt final
{ {
/** RAII class that automatically cleanses its data on destruction */
class SafeDbt final
{
Dbt m_dbt; Dbt m_dbt;
public: public:
// construct Dbt with internally-managed data // construct Dbt with internally-managed data
SafeDbt(); SafeDbt();
// construct Dbt with provided data // construct Dbt with provided data
@ -186,8 +183,11 @@ class BerkeleyBatch : public DatabaseBatch
// conversion operator to access the underlying Dbt // conversion operator to access the underlying Dbt
operator Dbt*(); operator Dbt*();
}; };
/** RAII class that provides access to a Berkeley database */
class BerkeleyBatch : public DatabaseBatch
{
private: private:
bool ReadKey(CDataStream&& key, CDataStream& value) override; bool ReadKey(CDataStream&& key, CDataStream& value) override;
bool WriteKey(CDataStream&& key, CDataStream&& value, bool overwrite = true) override; bool WriteKey(CDataStream&& key, CDataStream&& value, bool overwrite = true) override;