diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-11 21:26:11 -0500 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-11 21:26:11 -0500 |
| commit | 8ad6996cc38c7e5e21698db91759fcc3e8900545 (patch) | |
| tree | 2b3ef6daafbbbfdca0d461ebcccedb913e8aaa04 /src/bitcoinrpc.cpp | |
| parent | b5d9c7d9fb2ddf66e414e22e1d599fb0ef0abb07 (diff) | |
| parent | 888ac4e7a326986945ca91668c47a3d8fa981d49 (diff) | |
| download | bitcoin-8ad6996cc38c7e5e21698db91759fcc3e8900545.tar.xz | |
Merge branch '0.4.x' into 0.5.0.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 b1d8514649..cf03666582 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -1427,7 +1427,7 @@ void ThreadCleanWalletPassphrase(void* parg) if (nWalletUnlockTime < nMyWakeTime) nWalletUnlockTime = nMyWakeTime; } - free(parg); + delete (int*)parg; return; } |