diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-04-23 17:05:36 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-04-23 17:06:28 +0200 |
| commit | 89bbd54fbfbb1b21257d436731868455821a101e (patch) | |
| tree | a394f051221cb79d684d5643855597187fabc210 /src/main.cpp | |
| parent | 97730c9b7f0f0e6f157f2d90adb38a014e0b93e2 (diff) | |
| parent | b39a07dc42ab6ba746a25206969fb81913146f1f (diff) | |
| download | bitcoin-89bbd54fbfbb1b21257d436731868455821a101e.tar.xz | |
Merge pull request #4085
b39a07d Add missing AssertLockHeld in ConnectBlock (Wladimir J. van der Laan)
41106a5 qt: get required locks upfront in polling functions (Wladimir J. van der Laan)
ed67100 Add required locks in tests (Wladimir J. van der Laan)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp index 0bbe833705..a591168c07 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1727,6 +1727,7 @@ void ThreadScriptCheck() { bool ConnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, CCoinsViewCache& view, bool fJustCheck) { + AssertLockHeld(cs_main); // Check it again in case a previous version let a bad block in if (!CheckBlock(block, state, !fJustCheck, !fJustCheck)) return false; |