Merge pull request #5541

laanwj · laanwj · commit 3c9daa2f241c · 2014-12-27T04:06:48.000+01:00
d78f0da Fix CScriptID(const CScript& in) in empty script case (Peter Todd)
diff --git 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)
 {

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ typedef vector<unsigned char> valtype;`
`18`	`18`
`19`	`19`	`unsigned nMaxDatacarrierBytes = MAX_OP_RETURN_RELAY;`
`20`	`20`
`21`		`-CScriptID::CScriptID(const CScript& in) : uint160(in.size() ? Hash160(in.begin(), in.end()) : 0) {}`
	`21`	`+CScriptID::CScriptID(const CScript& in) : uint160(Hash160(in.begin(), in.end())) {}`
`22`	`22`
`23`	`23`	`const char* GetTxnOutputType(txnouttype t)`
`24`	`24`	`{`