Merge pull request #5564

de236f5 clarify obscure uses of EvalScript() (Pavel Vasin)
This commit is contained in:
Wladimir J. van der Laan
2015-01-06 11:51:09 +01:00
2 changed files with 5 additions and 5 deletions

View File

@@ -764,7 +764,7 @@ bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
// IsStandard() will have already returned false
// and this method isn't called.
vector<vector<unsigned char> > stack;
if (!EvalScript(stack, tx.vin[i].scriptSig, false, BaseSignatureChecker()))
if (!EvalScript(stack, tx.vin[i].scriptSig, SCRIPT_VERIFY_NONE, BaseSignatureChecker()))
return false;
if (whichType == TX_SCRIPTHASH)