diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-27 04:06:27 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-27 04:06:48 +0100 |
| commit | 3c9daa2f241cf21ea3498cc2f1b3ff60ea860f67 (patch) | |
| tree | dddfac56a964994772ec72810c65869a4975932b | |
| parent | 4312c8fc1892fd01a59cbccffffbb5082e36b695 (diff) | |
| parent | d78f0dafd520f481f909cca7e361a4e482cbea72 (diff) | |
| download | bitcoin-3c9daa2f241cf21ea3498cc2f1b3ff60ea860f67.tar.xz | |
Merge pull request #5541
d78f0da Fix CScriptID(const CScript& in) in empty script case (Peter Todd)
| -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 d0e2250049..ce50e3aad8 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) { |