diff options
| author | Karl-Johan Alm <karljohan-alm@garage.co.jp> | 2017-08-09 17:24:15 +0900 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2017-10-03 18:15:46 +0200 |
| commit | 9e8aae31c103e1d76365c34ce1fe1dd68e93912b (patch) | |
| tree | af144ee78e4268ed975ace9a411c30ab5578100d /src/wallet | |
| parent | fb7b5293844ea6adc5dcf5ad0a0c5890b4495939 (diff) | |
| download | bitcoin-9e8aae31c103e1d76365c34ce1fe1dd68e93912b.tar.xz | |
[wallet] Close DB on error.
Github-Pull: #11017
Rebased-From: 03bc719a85cb4928cb4b43d0bc4142f72cb01b23
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/db.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp index b12d46e40a..d2fe4866fa 100644 --- a/src/wallet/db.cpp +++ b/src/wallet/db.cpp @@ -101,8 +101,10 @@ bool CDBEnv::Open(const fs::path& pathIn) DB_RECOVER | nEnvFlags, S_IRUSR | S_IWUSR); - if (ret != 0) + if (ret != 0) { + dbenv->close(0); return error("CDBEnv::Open: Error %d opening database environment: %s\n", ret, DbEnv::strerror(ret)); + } fDbEnvInit = true; fMockDb = false; @@ -196,9 +198,9 @@ bool CDB::Recover(const std::string& filename, void *callbackDataIn, bool (*reco DB_BTREE, // Database type DB_CREATE, // Flags 0); - if (ret > 0) - { + if (ret > 0) { LogPrintf("Cannot create database file %s\n", filename); + pdbCopy->close(0); return false; } @@ -536,8 +538,10 @@ bool CDB::Rewrite(CWalletDBWrapper& dbw, const char* pszSkip) env->CloseDb(strFile); if (pdbCopy->close(0)) fSuccess = false; - delete pdbCopy; + } else { + pdbCopy->close(0); } + delete pdbCopy; } if (fSuccess) { Db dbA(env->dbenv, 0); |