diff options
| author | mruddy <mruddy@users.noreply.github.com> | 2015-07-30 19:56:00 -0400 |
|---|---|---|
| committer | mruddy <mruddy@users.noreply.github.com> | 2015-07-30 19:56:00 -0400 |
| commit | af3208bfa6967d6b35aecf0ba35d9d6bf0f8317e (patch) | |
| tree | f61b271e4446dae05172096c63d9320f4dbcaf2d /src/bitcoin-tx.cpp | |
| parent | 675d2feffa84a6ffeabac32aeed37f6a7f74bee3 (diff) | |
| download | bitcoin-af3208bfa6967d6b35aecf0ba35d9d6bf0f8317e.tar.xz | |
Resolve issue 3166.
These changes decode valid SIGHASH types on signatures in assembly (asm) representations of scriptSig scripts.
This squashed commit incorporates substantial helpful feedback from jtimon, laanwj, and sipa.
Diffstat (limited to 'src/bitcoin-tx.cpp')
| -rw-r--r-- | src/bitcoin-tx.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp index e389d51a73..f43df4f331 100644 --- a/src/bitcoin-tx.cpp +++ b/src/bitcoin-tx.cpp @@ -387,8 +387,8 @@ static void MutateTxSign(CMutableTransaction& tx, const string& flagStr) CCoinsModifier coins = view.ModifyCoins(txid); if (coins->IsAvailable(nOut) && coins->vout[nOut].scriptPubKey != scriptPubKey) { string err("Previous output scriptPubKey mismatch:\n"); - err = err + coins->vout[nOut].scriptPubKey.ToString() + "\nvs:\n"+ - scriptPubKey.ToString(); + err = err + ScriptToAsmStr(coins->vout[nOut].scriptPubKey) + "\nvs:\n"+ + ScriptToAsmStr(scriptPubKey); throw runtime_error(err); } if ((unsigned int)nOut >= coins->vout.size()) |