diff options
| author | Matt Corallo <[email protected]> | 2017-10-24 14:11:21 -0400 |
|---|---|---|
| committer | Matt Corallo <[email protected]> | 2017-10-24 14:11:52 -0400 |
| commit | a6f33ea77d3a48f06b5c7cfcc20553c9a88d429a (patch) | |
| tree | 52d4dd8a17a59d8aa4c6513994a3cd6f743fb44b /src/bitcoin-tx.cpp | |
| parent | Merge #11538: qa: Fix race condition failures in replace-by-fee.py, sendheade... (diff) | |
| download | discoin-a6f33ea77d3a48f06b5c7cfcc20553c9a88d429a.tar.xz discoin-a6f33ea77d3a48f06b5c7cfcc20553c9a88d429a.zip | |
Sanity-check script sizes in bitcoin-tx
Diffstat (limited to 'src/bitcoin-tx.cpp')
| -rw-r--r-- | src/bitcoin-tx.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index a20222d05..b499b1550 100644 --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -387,6 +387,10 @@ static void MutateTxAddOutMultiSig(CMutableTransaction& tx, const std::string& s scriptPubKey = GetScriptForWitness(scriptPubKey); } if (bScriptHash) { + if (scriptPubKey.size() > MAX_SCRIPT_ELEMENT_SIZE) { + throw std::runtime_error(strprintf( + "redeemScript exceeds size limit: %d > %d", scriptPubKey.size(), MAX_SCRIPT_ELEMENT_SIZE)); + } // Get the ID for the script, and then construct a P2SH destination for it. scriptPubKey = GetScriptForDestination(CScriptID(scriptPubKey)); } @@ -447,10 +451,19 @@ static void MutateTxAddOutScript(CMutableTransaction& tx, const std::string& str bScriptHash = (flags.find("S") != std::string::npos); } + if (scriptPubKey.size() > MAX_SCRIPT_SIZE) { + throw std::runtime_error(strprintf( + "script exceeds size limit: %d > %d", scriptPubKey.size(), MAX_SCRIPT_SIZE)); + } + if (bSegWit) { scriptPubKey = GetScriptForWitness(scriptPubKey); } if (bScriptHash) { + if (scriptPubKey.size() > MAX_SCRIPT_ELEMENT_SIZE) { + throw std::runtime_error(strprintf( + "redeemScript exceeds size limit: %d > %d", scriptPubKey.size(), MAX_SCRIPT_ELEMENT_SIZE)); + } scriptPubKey = GetScriptForDestination(CScriptID(scriptPubKey)); } |