Merge pull request #4501

laanwj · laanwj · commit f0fc81a0832a · 2014-07-11T05:02:15.000+02:00
954d2e7 Avoid a segfault on getblock if it can't read a block from disk. (Ruben Dario Ponticelli)
diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp
@@ -276,7 +276,9 @@ Value getblock(const Array& params, bool fHelp)
 
     CBlock block;
     CBlockIndex* pblockindex = mapBlockIndex[hash];
-    ReadBlockFromDisk(block, pblockindex);
+
+    if(!ReadBlockFromDisk(block, pblockindex))
+        throw JSONRPCError(RPC_INTERNAL_ERROR, "Can't read block from disk");
 
     if (!fVerbose)
     {

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,9 @@ Value getblock(const Array& params, bool fHelp)`
`276`	`276`
`277`	`277`	`CBlock block;`
`278`	`278`	`CBlockIndex* pblockindex = mapBlockIndex[hash];`
`279`		`- ReadBlockFromDisk(block, pblockindex);`
	`279`	`+`
	`280`	`+ if(!ReadBlockFromDisk(block, pblockindex))`
	`281`	`+ throw JSONRPCError(RPC_INTERNAL_ERROR, "Can't read block from disk");`
`280`	`282`
`281`	`283`	`if (!fVerbose)`
`282`	`284`	`{`