sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-28 05:23:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed segfault

Browse Source
This commit is contained in:
Evan Duffield 2015-02-04 07:44:23 -07:00
parent f811957208
commit efe22ea1ae
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/instantx.cpp
View File

@ -115,7 +115,6 @@ void ProcessMessageInstantX(CNode* pfrom, std::string& strCommand, CDataStream&
if (AcceptToMemoryPool(mempool, state, tx, true, &fMissingInputs)) if (AcceptToMemoryPool(mempool, state, tx, true, &fMissingInputs))
{ {
LogPrintf("ProcessMessageInstantX::txlreq - Transaction Lock Request : accepted (resolved) %s\n", LogPrintf("ProcessMessageInstantX::txlreq - Transaction Lock Request : accepted (resolved) %s\n",
pfrom->addr.ToString().c_str(), pfrom->cleanSubVer.c_str(),
tx.GetHash().ToString().c_str() tx.GetHash().ToString().c_str()
); );
} else { } else {
@ -157,7 +156,7 @@ void ProcessMessageInstantX(CNode* pfrom, std::string& strCommand, CDataStream&
if(mapUnknownVotes[ctx.vinMasternode.prevout.hash] > GetTime() && if(mapUnknownVotes[ctx.vinMasternode.prevout.hash] > GetTime() &&
mapUnknownVotes[ctx.vinMasternode.prevout.hash] - GetAverageVoteTime() > 60*10){ mapUnknownVotes[ctx.vinMasternode.prevout.hash] - GetAverageVoteTime() > 60*10){
LogPrintf("ProcessMessageInstantX::txlreq - masternode is spamming transaction votes: %s %s : rejected %s\n", LogPrintf("ProcessMessageInstantX::txlreq - masternode is spamming transaction votes: %s %s\n",
ctx.vinMasternode.ToString().c_str(), ctx.vinMasternode.ToString().c_str(),
ctx.txHash.ToString().c_str() ctx.txHash.ToString().c_str()
); );

3
src/masternode.cpp
View File

@ -720,9 +720,6 @@ bool CMasternodePayments::ProcessBlock(int nBlockHeight)
if(!enabled) return false; if(!enabled) return false;
CMasternodePaymentWinner winner; CMasternodePaymentWinner winner;
uint256 blockHash = 0;
if(!darkSendPool.GetBlockHash(blockHash, nBlockHeight-576)) return false;
std::vector<CTxIn> vecLastPayments; std::vector<CTxIn> vecLastPayments;
int c = 0; int c = 0;
BOOST_REVERSE_FOREACH(CMasternodePaymentWinner& winner, vWinning){ BOOST_REVERSE_FOREACH(CMasternodePaymentWinner& winner, vWinning){