Browse Source

Merge branch 'nodosbip16' of https://github.com/sipa/bitcoin

pull/1/head
Gavin Andresen 11 years ago
parent
commit
21503e4556
  1. 7
      src/main.cpp

7
src/main.cpp

@ -1128,7 +1128,14 @@ bool CTransaction::ConnectInputs(MapPrevTx inputs, @@ -1128,7 +1128,14 @@ bool CTransaction::ConnectInputs(MapPrevTx inputs,
{
// Verify signature
if (!VerifySignature(txPrev, *this, i, fStrictPayToScriptHash, 0))
{
// only during transition phase for P2SH: do not invoke anti-DoS code for
// potentially old clients relaying bad P2SH transactions
if (fStrictPayToScriptHash && VerifySignature(txPrev, *this, i, false, 0))
return error("ConnectInputs() : %s P2SH VerifySignature failed", GetHash().ToString().substr(0,10).c_str());
return DoS(100,error("ConnectInputs() : %s VerifySignature failed", GetHash().ToString().substr(0,10).c_str()));
}
}
// Mark outpoints as spent

Loading…
Cancel
Save