Bitcoin-Qt: fix crash on Windows caused by CDBEnv::EnvShutdown()
- can be triggerd by just adding -proxy=crashme with 0.7.1 - crash occured, when AppInit2() was left with return false; after the first call to bitdb.open() (Step 6 in init) - this is caused by GetDataDir() or .string() in CDBEnv::EnvShutdown() called via the bitdb global destructor - init fDbEnvInit and fMockDb to false in CDBEnv::CDBEnv()
This commit is contained in:
parent
4725e96a3a
commit
be8e1f8479
2 changed files with 6 additions and 2 deletions
|
@ -38,11 +38,13 @@ void CDBEnv::EnvShutdown()
|
||||||
if (ret != 0)
|
if (ret != 0)
|
||||||
printf("EnvShutdown exception: %s (%d)\n", DbEnv::strerror(ret), ret);
|
printf("EnvShutdown exception: %s (%d)\n", DbEnv::strerror(ret), ret);
|
||||||
if (!fMockDb)
|
if (!fMockDb)
|
||||||
DbEnv(0).remove(GetDataDir().string().c_str(), 0);
|
DbEnv(0).remove(strPath.c_str(), 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
CDBEnv::CDBEnv() : dbenv(DB_CXX_NO_EXCEPTIONS)
|
CDBEnv::CDBEnv() : dbenv(DB_CXX_NO_EXCEPTIONS)
|
||||||
{
|
{
|
||||||
|
fDbEnvInit = false;
|
||||||
|
fMockDb = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
CDBEnv::~CDBEnv()
|
CDBEnv::~CDBEnv()
|
||||||
|
@ -63,6 +65,7 @@ bool CDBEnv::Open(const boost::filesystem::path& path)
|
||||||
if (fShutdown)
|
if (fShutdown)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
strPath = path.string();
|
||||||
filesystem::path pathLogDir = path / "database";
|
filesystem::path pathLogDir = path / "database";
|
||||||
filesystem::create_directory(pathLogDir);
|
filesystem::create_directory(pathLogDir);
|
||||||
filesystem::path pathErrorFile = path / "db.log";
|
filesystem::path pathErrorFile = path / "db.log";
|
||||||
|
@ -83,7 +86,7 @@ bool CDBEnv::Open(const boost::filesystem::path& path)
|
||||||
dbenv.set_flags(DB_AUTO_COMMIT, 1);
|
dbenv.set_flags(DB_AUTO_COMMIT, 1);
|
||||||
dbenv.set_flags(DB_TXN_WRITE_NOSYNC, 1);
|
dbenv.set_flags(DB_TXN_WRITE_NOSYNC, 1);
|
||||||
dbenv.log_set_config(DB_LOG_AUTO_REMOVE, 1);
|
dbenv.log_set_config(DB_LOG_AUTO_REMOVE, 1);
|
||||||
int ret = dbenv.open(path.string().c_str(),
|
int ret = dbenv.open(strPath.c_str(),
|
||||||
DB_CREATE |
|
DB_CREATE |
|
||||||
DB_INIT_LOCK |
|
DB_INIT_LOCK |
|
||||||
DB_INIT_LOG |
|
DB_INIT_LOG |
|
||||||
|
|
1
src/db.h
1
src/db.h
|
@ -33,6 +33,7 @@ class CDBEnv
|
||||||
private:
|
private:
|
||||||
bool fDbEnvInit;
|
bool fDbEnvInit;
|
||||||
bool fMockDb;
|
bool fMockDb;
|
||||||
|
std::string strPath;
|
||||||
|
|
||||||
void EnvShutdown();
|
void EnvShutdown();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue