diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2014-06-04 20:15:45 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2014-06-04 20:15:45 -0400 |
| commit | 4fee61a905e70c93338d8b98303e3b509746ed97 (patch) | |
| tree | 1c74493e61f6182d64bf737156e4907a56e096f7 /src | |
| parent | de0cbd10786cf4744b6ad32a847818e3d620ee3d (diff) | |
| parent | 4a48a0671d2e02ba2a86af98282a452f23546b9e (diff) | |
| download | bitcoin-4fee61a905e70c93338d8b98303e3b509746ed97.tar.xz | |
Merge pull request #4287 from laanwj/2014_06_sideeffect
Remove side effect in assertion in ProcessGetData
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index fa47bf7f08..8e63e4213f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3390,7 +3390,8 @@ void static ProcessGetData(CNode* pfrom) { // Send block from disk CBlock block; - assert(ReadBlockFromDisk(block, (*mi).second)); + if (!ReadBlockFromDisk(block, (*mi).second)) + assert(!"cannot load block from disk"); if (inv.type == MSG_BLOCK) pfrom->PushMessage("block", block); else // MSG_FILTERED_BLOCK) |