diff options
| author | Peter Todd <pete@petertodd.org> | 2014-12-25 03:12:17 -0500 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-27 04:09:41 +0100 |
| commit | 06ca0651b626eb6e500835e7d3cab9b3e43f3e38 (patch) | |
| tree | b89c7ee35e6d33381ca80da06cfe7a28f0f5751e /src | |
| parent | 4e0bfa581438a662147fe4459522b308406d7f57 (diff) | |
| download | bitcoin-06ca0651b626eb6e500835e7d3cab9b3e43f3e38.tar.xz | |
Fix CScriptID(const CScript& in) in empty script case
Previously an empty script wouldn't be hashed, and CScriptID would be
assigned the incorrect value of 0 instead. This bug can be seen in the
RPC decodescript command:
$ btc decodescript ""
{
"asm" : "",
"type" : "nonstandard",
"p2sh" : "31h1vYVSYuKP6AhS86fbRdMw9XHieotbST"
}
Correct output:
$ btc decodescript ""
{
"asm" : "",
"type" : "nonstandard",
"p2sh" : "3J98t1WpEZ73CNmQviecrnyiWrnqRhWNLy"
}
Rebased-From: d78f0dafd520f481f909cca7e361a4e482cbea72
Github-Pull: #5541
Diffstat (limited to 'src')
| -rw-r--r-- | src/script/standard.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/standard.cpp b/src/script/standard.cpp index ab6e6cde0d..6e2c465c86 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -18,7 +18,7 @@ typedef vector<unsigned char> valtype; unsigned nMaxDatacarrierBytes = MAX_OP_RETURN_RELAY; -CScriptID::CScriptID(const CScript& in) : uint160(in.size() ? Hash160(in.begin(), in.end()) : 0) {} +CScriptID::CScriptID(const CScript& in) : uint160(Hash160(in.begin(), in.end())) {} const char* GetTxnOutputType(txnouttype t) { |