Merge pull request #409 from TheBlueMatt/master

Fix crashes when a wallet is locked and GetReservedKey() is called
2011-07-13 18:22:19 -07:00 · 2011-07-13 18:22:19 -07:00 · 60d2f8662c
parent 9cd22ab862 0d7b28e52e
commit 60d2f8662c
1 changed files with 4 additions and 1 deletions
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@ -1320,7 +1320,10 @@ vector<unsigned char> CReserveKey::GetReservedKey()
    {
        CKeyPool keypool;
        pwallet->ReserveKeyFromKeyPool(nIndex, keypool);
-        vchPubKey = keypool.vchPubKey;
+        if (nIndex != -1)
+            vchPubKey = keypool.vchPubKey;
+        else
+            vchPubKey = vchDefaultKey;
    }
    assert(!vchPubKey.empty());
    return vchPubKey;