diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2014-02-26 13:52:56 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2014-02-26 13:52:56 -0500 |
| commit | ae7e5d7cebd9466d0c095233c9273e72e88fede1 (patch) | |
| tree | f6431a42b65c7318b891407fd1812f58e84078ab /src/script.cpp | |
| parent | e3e65d29b70c64808b3ab5c58ce0b3bcefaadc5d (diff) | |
| parent | 8175c790eb12f0b0ca3197895a6d1d479b340b67 (diff) | |
| download | bitcoin-ae7e5d7cebd9466d0c095233c9273e72e88fede1.tar.xz | |
Merge pull request #3737 from jgarzik/op-return-size
script: reduce OP_RETURN standard relay bytes to 40
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 f03a1e3cbb..810ba16d28 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -1298,8 +1298,8 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi } else if (opcode2 == OP_SMALLDATA) { - // small pushdata, <= 80 bytes - if (vch1.size() > 80) + // small pushdata, <= MAX_OP_RETURN_RELAY bytes + if (vch1.size() > MAX_OP_RETURN_RELAY) break; } else if (opcode1 != opcode2 || vch1 != vch2) |