LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Packages Projects Releases 32 Wiki Activity

[wallet] Close DB on error.

Browse source
This commit is contained in:
Karl-Johan Alm 2017-08-09 17:24:15 +09:00
parent 929fd7276c
commit 03bc719a85
No known key found for this signature in database
GPG key ID: 57AF762DB3353322
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/wallet/db.cpp
View file

@ -101,8 +101,10 @@ bool CDBEnv::Open(const fs::path& pathIn)
DB_RECOVER | DB_RECOVER |
nEnvFlags, nEnvFlags,
S_IRUSR | S_IWUSR); 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)); return error("CDBEnv::Open: Error %d opening database environment: %s\n", ret, DbEnv::strerror(ret));
}
fDbEnvInit = true; fDbEnvInit = true;
fMockDb = false; fMockDb = false;
@ -196,9 +198,9 @@ bool CDB::Recover(const std::string& filename, void *callbackDataIn, bool (*reco
DB_BTREE, // Database type DB_BTREE, // Database type
DB_CREATE, // Flags DB_CREATE, // Flags
0); 0);
if (ret > 0) if (ret > 0) {
{
LogPrintf("Cannot create database file %s\n", filename); LogPrintf("Cannot create database file %s\n", filename);
pdbCopy->close(0);
return false; return false;
} }
@ -536,8 +538,10 @@ bool CDB::Rewrite(CWalletDBWrapper& dbw, const char* pszSkip)
env->CloseDb(strFile); env->CloseDb(strFile);
if (pdbCopy->close(0)) if (pdbCopy->close(0))
fSuccess = false; fSuccess = false;
delete pdbCopy; } else {
pdbCopy->close(0);
} }
delete pdbCopy;
} }
if (fSuccess) { if (fSuccess) {
Db dbA(env->dbenv, 0); Db dbA(env->dbenv, 0);