DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Auto merge of #3077 - str4d:asan-initialization-order-fiasco, r=str4d

Browse Source 
Split declaration and definition of SPROUT_BRANCH_ID constant

Fixes an initialization-order-fiasco error detected by ASan:
https://ci.z.cash/#/builders/7/builds/149
This commit is contained in:
Homu
2018-03-20 16:16:13 -07:00
parent 64de921747 a6ae8f55ae
commit 8ed0346284
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/consensus/upgrades.cpp
View File

@@ -26,6 +26,8 @@ const struct NUInfo NetworkUpgradeInfo[Consensus::MAX_NETWORK_UPGRADES] = {
} }
}; };
const uint32_t SPROUT_BRANCH_ID = NetworkUpgradeInfo[Consensus::BASE_SPROUT].nBranchId;
UpgradeState NetworkUpgradeState( UpgradeState NetworkUpgradeState(
int nHeight, int nHeight,
const Consensus::Params& params, const Consensus::Params& params,

2
src/consensus/upgrades.h
View File

@@ -27,7 +27,7 @@ struct NUInfo {
extern const struct NUInfo NetworkUpgradeInfo[]; extern const struct NUInfo NetworkUpgradeInfo[];
// Consensus branch id to identify pre-overwinter (Sprout) consensus rules. // Consensus branch id to identify pre-overwinter (Sprout) consensus rules.
static const uint32_t SPROUT_BRANCH_ID = NetworkUpgradeInfo[Consensus::BASE_SPROUT].nBranchId; extern const uint32_t SPROUT_BRANCH_ID;
/** /**
* Checks the state of a given network upgrade based on block height. * Checks the state of a given network upgrade based on block height.