Introduce constant for maximum CScript length
This commit is contained in:
parent
c4e8390047
commit
f8e6fb1800
2 changed files with 4 additions and 1 deletions
|
@ -247,7 +247,7 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un
|
||||||
vector<bool> vfExec;
|
vector<bool> vfExec;
|
||||||
vector<valtype> altstack;
|
vector<valtype> altstack;
|
||||||
set_error(serror, SCRIPT_ERR_UNKNOWN_ERROR);
|
set_error(serror, SCRIPT_ERR_UNKNOWN_ERROR);
|
||||||
if (script.size() > 10000)
|
if (script.size() > MAX_SCRIPT_SIZE)
|
||||||
return set_error(serror, SCRIPT_ERR_SCRIPT_SIZE);
|
return set_error(serror, SCRIPT_ERR_SCRIPT_SIZE);
|
||||||
int nOpCount = 0;
|
int nOpCount = 0;
|
||||||
bool fRequireMinimal = (flags & SCRIPT_VERIFY_MINIMALDATA) != 0;
|
bool fRequireMinimal = (flags & SCRIPT_VERIFY_MINIMALDATA) != 0;
|
||||||
|
|
|
@ -27,6 +27,9 @@ static const int MAX_OPS_PER_SCRIPT = 201;
|
||||||
// Maximum number of public keys per multisig
|
// Maximum number of public keys per multisig
|
||||||
static const int MAX_PUBKEYS_PER_MULTISIG = 20;
|
static const int MAX_PUBKEYS_PER_MULTISIG = 20;
|
||||||
|
|
||||||
|
// Maximum script length in bytes
|
||||||
|
static const int MAX_SCRIPT_SIZE = 10000;
|
||||||
|
|
||||||
// Threshold for nLockTime: below this value it is interpreted as block number,
|
// Threshold for nLockTime: below this value it is interpreted as block number,
|
||||||
// otherwise as UNIX timestamp.
|
// otherwise as UNIX timestamp.
|
||||||
static const unsigned int LOCKTIME_THRESHOLD = 500000000; // Tue Nov 5 00:53:20 1985 UTC
|
static const unsigned int LOCKTIME_THRESHOLD = 500000000; // Tue Nov 5 00:53:20 1985 UTC
|
||||||
|
|
Loading…
Reference in a new issue