maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #5301

Browse source
This commit is contained in:
Jeff Garzik 2014-11-18 12:11:17 -05:00
parent 7715c84747 e2f30d547f
commit e3560029ce
Failed to extract signature
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/rest.cpp
View file

@ -11,6 +11,7 @@
#include "core/transaction.h" #include "core/transaction.h"
#include "version.h" #include "version.h"
#include "main.h" #include "main.h"
#include "sync.h"
using namespace std; using namespace std;
using namespace json_spirit; using namespace json_spirit;
@ -80,13 +81,17 @@ static bool rest_block(AcceptedConnection *conn,
if (!ParseHashStr(hashStr, hash)) if (!ParseHashStr(hashStr, hash))
throw RESTERR(HTTP_BAD_REQUEST, "Invalid hash: " + hashStr); throw RESTERR(HTTP_BAD_REQUEST, "Invalid hash: " + hashStr);
if (mapBlockIndex.count(hash) == 0)
throw RESTERR(HTTP_NOT_FOUND, hashStr + " not found");
CBlock block; CBlock block;
CBlockIndex* pblockindex = mapBlockIndex[hash]; CBlockIndex* pblockindex = NULL;
if (!ReadBlockFromDisk(block, pblockindex)) {
throw RESTERR(HTTP_NOT_FOUND, hashStr + " not found"); LOCK(cs_main);
if (mapBlockIndex.count(hash) == 0)
throw RESTERR(HTTP_NOT_FOUND, hashStr + " not found");
pblockindex = mapBlockIndex[hash];
if (!ReadBlockFromDisk(block, pblockindex))
throw RESTERR(HTTP_NOT_FOUND, hashStr + " not found");
}
CDataStream ssBlock(SER_NETWORK, PROTOCOL_VERSION); CDataStream ssBlock(SER_NETWORK, PROTOCOL_VERSION);
ssBlock << block; ssBlock << block;