Merge pull request bitcoin#409 from TheBlueMatt/master

Fix crashes when a wallet is locked and GetReservedKey() is called
thommahoney · Jul 14, 2011 · 60d2f86 · 60d2f86
2 parents 9cd22ab + 0d7b28e
commit 60d2f86
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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;