Fix CScriptID(const CScript& in) in empty script case

petertodd · petertodd · commit d78f0dafd520 · 2014-12-25T03:18:40.000-05:00
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"
    }
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`	`{`