diff options
| author | Gavin Andresen <[email protected]> | 2013-01-23 06:48:17 -0800 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2013-01-23 06:48:17 -0800 |
| commit | 1a2e45d8d50d22929ab12ae68189e6171907dba5 (patch) | |
| tree | 9cd7c7ea8dbf7aa40299ef2dca6de2d654a076e9 /src/script.cpp | |
| parent | Merge pull request #1872 from gmaxwell/listaddrnotmine (diff) | |
| parent | Replace 520 constant with MAX_SCRIPT_ELEMENT_SIZE (diff) | |
| download | discoin-1a2e45d8d50d22929ab12ae68189e6171907dba5.tar.xz discoin-1a2e45d8d50d22929ab12ae68189e6171907dba5.zip | |
Merge pull request #2188 from TheBlueMatt/bloom
Send transactions after a CMerkleBlock when asked for it in an inv.
Diffstat (limited to 'src/script.cpp')
| -rw-r--r-- | src/script.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script.cpp b/src/script.cpp index 70adf1f9d..45ac8335d 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -340,7 +340,7 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, co // if (!script.GetOp(pc, opcode, vchPushValue)) return false; - if (vchPushValue.size() > 520) + if (vchPushValue.size() > MAX_SCRIPT_ELEMENT_SIZE) return false; if (opcode > OP_16 && ++nOpCount > 201) return false; @@ -670,7 +670,7 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, co valtype& vch2 = stacktop(-1); vch1.insert(vch1.end(), vch2.begin(), vch2.end()); popstack(stack); - if (stacktop(-1).size() > 520) + if (stacktop(-1).size() > MAX_SCRIPT_ELEMENT_SIZE) return false; } break; |