Merge pull request #5541

d78f0da Fix CScriptID(const CScript& in) in empty script case (Peter Todd)
This commit is contained in:
Wladimir J. van der Laan 2014-12-27 04:06:27 +01:00
commit 3c9daa2f24
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6

View File

@ -18,7 +18,7 @@ typedef vector<unsigned char> valtype;
unsigned nMaxDatacarrierBytes = MAX_OP_RETURN_RELAY; 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) const char* GetTxnOutputType(txnouttype t)
{ {