Merge pull request #4287 from laanwj/2014_06_sideeffect
Remove side effect in assertion in ProcessGetData
This commit is contained in:
commit
4fee61a905
1 changed files with 2 additions and 1 deletions
|
@ -3390,7 +3390,8 @@ void static ProcessGetData(CNode* pfrom)
|
||||||
{
|
{
|
||||||
// Send block from disk
|
// Send block from disk
|
||||||
CBlock block;
|
CBlock block;
|
||||||
assert(ReadBlockFromDisk(block, (*mi).second));
|
if (!ReadBlockFromDisk(block, (*mi).second))
|
||||||
|
assert(!"cannot load block from disk");
|
||||||
if (inv.type == MSG_BLOCK)
|
if (inv.type == MSG_BLOCK)
|
||||||
pfrom->PushMessage("block", block);
|
pfrom->PushMessage("block", block);
|
||||||
else // MSG_FILTERED_BLOCK)
|
else // MSG_FILTERED_BLOCK)
|
||||||
|
|
Loading…
Add table
Reference in a new issue