Permalink
Browse files

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

  • Loading branch information...
gavinandresen committed Feb 27, 2012
2 parents 46aa2a6 + db9f2e0 commit 21503e4556f1dba968bb6ff611cc3d0702993d61
Showing with 7 additions and 0 deletions.
  1. +7 −0 src/main.cpp
View
@@ -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

0 comments on commit 21503e4

Please sign in to comment.