diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-11 21:26:22 -0500 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-11 21:26:22 -0500 |
| commit | 9ab932b76988d41ea83d4c5cfb9353e06922ccaa (patch) | |
| tree | fd208a144c793435a5cd09727845763348f7e319 /src/bitcoinrpc.cpp | |
| parent | 84d228ed839e527f8638db5f451e05bd58905f52 (diff) | |
| parent | 8ad6996cc38c7e5e21698db91759fcc3e8900545 (diff) | |
| download | bitcoin-9ab932b76988d41ea83d4c5cfb9353e06922ccaa.tar.xz | |
Merge branch '0.5.0.x' into 0.5.x
Diffstat (limited to 'src/bitcoinrpc.cpp')
| -rw-r--r-- | src/bitcoinrpc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index d44e4a6bdf..506e194612 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -1431,7 +1431,7 @@ void ThreadCleanWalletPassphrase(void* parg) if (nWalletUnlockTime < nMyWakeTime) nWalletUnlockTime = nMyWakeTime; } - free(parg); + delete (int*)parg; return; } |