aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2012-02-20 22:35:08 +0100
committerPieter Wuille <pieter.wuille@gmail.com>2012-02-20 22:35:08 +0100
commit73aa0421a73952ce13d731d8bbeabd2bb85d0bbf (patch)
tree98c4a6e98b757f2d9833f90a09e03bccdb9b4103
parent0d56f11ada27d8fa60c8f5179917a7c9de4a8c4b (diff)
downloadbitcoin-73aa0421a73952ce13d731d8bbeabd2bb85d0bbf.tar.xz
ProcessBlock is sometimes called with pfrom==NULL
-rw-r--r--src/main.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index b73037fb6a..ca998ea8c9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1652,7 +1652,8 @@ bool ProcessBlock(CNode* pfrom, CBlock* pblock)
int64 deltaTime = pblock->GetBlockTime() - pcheckpoint->nTime;
if (deltaTime < 0)
{
- pfrom->Misbehaving(100);
+ if (pfrom)
+ pfrom->Misbehaving(100);
return error("ProcessBlock() : block with timestamp before last checkpoint");
}
CBigNum bnNewBlock;
@@ -1661,7 +1662,8 @@ bool ProcessBlock(CNode* pfrom, CBlock* pblock)
bnRequired.SetCompact(ComputeMinWork(pcheckpoint->nBits, deltaTime));
if (bnNewBlock > bnRequired)
{
- pfrom->Misbehaving(100);
+ if (pfrom)
+ pfrom->Misbehaving(100);
return error("ProcessBlock() : block with too little proof-of-work");
}
}