diff options
| author | Jonas Schnelli <jonas.schnelli@include7.ch> | 2015-04-27 05:18:24 +0200 |
|---|---|---|
| committer | Jonas Schnelli <jonas.schnelli@include7.ch> | 2015-05-11 16:10:08 +0200 |
| commit | 03c56872b532d111645f83f4cb80c36a3e46d54f (patch) | |
| tree | 5767fb219a14e6f058e8a7c996a72d6b8f2a3428 /src | |
| parent | 1b2e555593ed2fade74657355e13fbad2f0b552c (diff) | |
| download | bitcoin-03c56872b532d111645f83f4cb80c36a3e46d54f.tar.xz | |
appropriate response when trying to get a block in pruned mode
Diffstat (limited to 'src')
| -rw-r--r-- | src/rest.cpp | 3 | ||||
| -rw-r--r-- | src/rpcblockchain.cpp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/rest.cpp b/src/rest.cpp index adc2d56284..69bf5b58ac 100644 --- a/src/rest.cpp +++ b/src/rest.cpp @@ -174,6 +174,9 @@ static bool rest_block(AcceptedConnection* conn, throw RESTERR(HTTP_NOT_FOUND, hashStr + " not found"); pblockindex = mapBlockIndex[hash]; + if (fHavePruned && !(pblockindex->nStatus & BLOCK_HAVE_DATA) && pblockindex->nTx > 0) + throw RESTERR(HTTP_NOT_FOUND, hashStr + " not available (pruned data)"); + if (!ReadBlockFromDisk(block, pblockindex)) throw RESTERR(HTTP_NOT_FOUND, hashStr + " not found"); } diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index d8771d1dd5..126e201528 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -299,6 +299,9 @@ Value getblock(const Array& params, bool fHelp) CBlock block; CBlockIndex* pblockindex = mapBlockIndex[hash]; + if (fHavePruned && !(pblockindex->nStatus & BLOCK_HAVE_DATA) && pblockindex->nTx > 0) + throw JSONRPCError(RPC_INTERNAL_ERROR, "Block not available (pruned data)"); + if(!ReadBlockFromDisk(block, pblockindex)) throw JSONRPCError(RPC_INTERNAL_ERROR, "Can't read block from disk"); |