sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 04:52:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #11554: Sanity-check script sizes in bitcoin-tx

Browse Source 
a6f33ea77 Sanity-check script sizes in bitcoin-tx (Matt Corallo)

Pull request description:

Tree-SHA512: bb8ecb628763af23816ab085758f6140920a6ff05dcb298129c2bbe584a02a759c700a05740eca77023292c98a5658b2a608fa27d5a948d183f87ed9ab827952
This commit is contained in:
MarcoFalke 2017-11-07 11:19:33 -05:00 committed by Alexander Block
parent 7919c96818
commit 569a11fef4
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/dash-tx.cpp
View File

@ -351,7 +351,10 @@ static void MutateTxAddOutMultiSig(CMutableTransaction& tx, const std::string& s
CScript scriptPubKey = GetScriptForMultisig(required, pubkeys); CScript scriptPubKey = GetScriptForMultisig(required, pubkeys);
if (bScriptHash) { if (bScriptHash) {
// Get the address for the redeem script, then call if (scriptPubKey.size() > MAX_SCRIPT_ELEMENT_SIZE) {
throw std::runtime_error(strprintf(
"redeemScript exceeds size limit: %d > %d", scriptPubKey.size(), MAX_SCRIPT_ELEMENT_SIZE));
}
// GetScriptForDestination() to construct a P2SH scriptPubKey. // GetScriptForDestination() to construct a P2SH scriptPubKey.
CBitcoinAddress addr(scriptPubKey); CBitcoinAddress addr(scriptPubKey);
scriptPubKey = GetScriptForDestination(addr.Get()); scriptPubKey = GetScriptForDestination(addr.Get());
@ -411,9 +414,18 @@ static void MutateTxAddOutScript(CMutableTransaction& tx, const std::string& str
bScriptHash = (flags.find("S") != std::string::npos); 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 (bScriptHash) { if (bScriptHash) {
CBitcoinAddress addr(scriptPubKey); if (scriptPubKey.size() > MAX_SCRIPT_ELEMENT_SIZE) {
scriptPubKey = GetScriptForDestination(addr.Get()); throw std::runtime_error(strprintf(
"redeemScript exceeds size limit: %d > %d", scriptPubKey.size(), MAX_SCRIPT_ELEMENT_SIZE));
}
CBitcoinAddress addr(scriptPubKey);
scriptPubKey = GetScriptForDestination(addr.Get());
} }
// construct TxOut, append to transaction output list // construct TxOut, append to transaction output list