diff options
| author | Gavin Andresen <[email protected]> | 2012-01-03 10:23:20 -0500 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2012-01-03 10:23:20 -0500 |
| commit | 73e86eedd5703e43bb8770a62acbb7c589a1905a (patch) | |
| tree | 78fb19bacbb0cb6b32e3c0994b6f3572efb53b98 /src/script.cpp | |
| parent | Merge branch 'gitianfix' of https://github.com/TheBlueMatt/bitcoin (diff) | |
| parent | make sure IsMine only returns true when we own all keys (diff) | |
| download | discoin-73e86eedd5703e43bb8770a62acbb7c589a1905a.tar.xz discoin-73e86eedd5703e43bb8770a62acbb7c589a1905a.zip | |
Merge branch 'bugfix_multisig' of https://github.com/coderrr/bitcoin
Diffstat (limited to 'src/script.cpp')
| -rw-r--r-- | src/script.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script.cpp b/src/script.cpp index f576e14a8..34872808b 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -1436,7 +1436,7 @@ bool IsMine(const CKeyStore &keystore, const CScript& scriptPubKey) // them) enable spend-out-from-under-you attacks, especially // in shared-wallet situations. vector<valtype> keys(vSolutions.begin()+1, vSolutions.begin()+vSolutions.size()-1); - return HaveKeys(vSolutions, keystore); + return HaveKeys(keys, keystore) == keys.size(); } } return false; |