sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 04:22:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix potential deadlock in CInstantSendDb::Upgrade() (#4548)

Browse Source
This commit is contained in:
UdjinM6 2021-10-26 22:50:09 +03:00 committed by GitHub
parent db77905703
commit 95262de6b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/llmq/instantsend.cpp
View File

@ -58,8 +58,11 @@ CInstantSendDb::CInstantSendDb(bool unitTests, bool fWipe)
db = std::make_unique<CDBWrapper>(unitTests ? "" : (GetDataDir() / "llmq/isdb"), 32 << 20, unitTests, fWipe); db = std::make_unique<CDBWrapper>(unitTests ? "" : (GetDataDir() / "llmq/isdb"), 32 << 20, unitTests, fWipe);
} }
void CInstantSendDb::Upgrade() void CInstantSendDb::Upgrade() EXCLUSIVE_LOCKS_REQUIRED(cs_main, ::mempool.cs)
{ {
AssertLockHeld(cs_main);
AssertLockHeld(::mempool.cs);
LOCK(cs_db); LOCK(cs_db);
int v{0}; int v{0};
if (!db->Read(DB_VERSION, v) || v < CInstantSendDb::CURRENT_VERSION) { if (!db->Read(DB_VERSION, v) || v < CInstantSendDb::CURRENT_VERSION) {
@ -1267,7 +1270,7 @@ void CInstantSendManager::NotifyChainLock(const CBlockIndex* pindexChainLock)
void CInstantSendManager::UpdatedBlockTip(const CBlockIndex* pindexNew) void CInstantSendManager::UpdatedBlockTip(const CBlockIndex* pindexNew)
{ {
if (!fUpgradedDB) { if (!fUpgradedDB) {
LOCK(cs_main); LOCK2(cs_main, ::mempool.cs); // for GetTransaction in Upgrade
if (VersionBitsState(pindexNew, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0020, versionbitscache) == ThresholdState::ACTIVE) { if (VersionBitsState(pindexNew, Params().GetConsensus(), Consensus::DEPLOYMENT_DIP0020, versionbitscache) == ThresholdState::ACTIVE) {
db.Upgrade(); db.Upgrade();
fUpgradedDB = true; fUpgradedDB = true;