Skip to content
Permalink
Browse files

Resolves issue #922 - "wallet passphrase timeout of several years doe…

…sn't work"

2^31 milliseconds is only about 25 days. Also clamps Sleep() to 10 years,
because it currently sleeps for 0 seconds when the sleep time would cross
2^31 seconds since the epoch. Hopefully boost will be fixed by 2028.
  • Loading branch information...
gmaxwell committed Mar 10, 2012
1 parent 4585d82 commit 82a10c81707dcff5ee24dec7ef7ebf8eccfded03
Showing with 6 additions and 4 deletions.
  1. +3 −3 src/bitcoinrpc.cpp
  2. +3 −1 src/util.h
@@ -1548,7 +1548,7 @@ void ThreadTopUpKeyPool(void* parg)

void ThreadCleanWalletPassphrase(void* parg)
{
int64 nMyWakeTime = GetTimeMillis() + *((int*)parg) * 1000;
int64 nMyWakeTime = GetTimeMillis() + *((int64*)parg) * 1000;

ENTER_CRITICAL_SECTION(cs_nWalletUnlockTime);

@@ -1584,7 +1584,7 @@ void ThreadCleanWalletPassphrase(void* parg)

LEAVE_CRITICAL_SECTION(cs_nWalletUnlockTime);

delete (int*)parg;
delete (int64*)parg;
}

Value walletpassphrase(const Array& params, bool fHelp)
@@ -1619,7 +1619,7 @@ Value walletpassphrase(const Array& params, bool fHelp)
"Stores the wallet decryption key in memory for <timeout> seconds.");

CreateThread(ThreadTopUpKeyPool, NULL);
int* pnSleepTime = new int(params[1].get_int());
int64* pnSleepTime = new int64(params[1].get_int64());
CreateThread(ThreadCleanWalletPassphrase, pnSleepTime);

return Value::null;
@@ -88,7 +88,9 @@ T* alignup(T* p)
#define Beep(n1,n2) (0)
inline void Sleep(int64 n)
{
boost::thread::sleep(boost::get_system_time() + boost::posix_time::milliseconds(n));
/*Boost has a year 2038 problem— if the request sleep time is past epoch+2^31 seconds the sleep returns instantly.
So we clamp our sleeps here to 10 years and hope that boost is fixed by 2028.*/
boost::thread::sleep(boost::get_system_time() + boost::posix_time::milliseconds(n>315576000000LL?315576000000LL:n));
}
#endif

0 comments on commit 82a10c8

Please sign in to comment.
You can’t perform that action at this time.