Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #636 from gavinandresen/master

Fix crash-on-wallet-upgrade bug on OSX
  • Loading branch information...
commit 1b93ea0e31c82bd23f2ddc0b5a98707fcbddce27 2 parents 709c1b2 + c4de918
@gavinandresen gavinandresen authored
Showing with 15 additions and 8 deletions.
  1. +1 −1  bitcoin-qt.pro
  2. +14 −7 src/db.cpp
View
2  bitcoin-qt.pro
@@ -256,7 +256,7 @@ windows:RC_FILE = src/qt/res/bitcoin-qt.rc
macx:HEADERS += src/qt/macdockiconhandler.h
macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm
macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
-macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0 BOOST_FILESYSTEM_VERSION=3
+macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0
macx:ICON = src/qt/res/icons/bitcoin.icns
macx:TARGET = "Bitcoin-Qt"
View
21 src/db.cpp
@@ -34,7 +34,14 @@ static void EnvShutdown(bool fRemoveLogFiles)
return;
fDbEnvInit = false;
- dbenv.close(0);
+ try
+ {
+ dbenv.close(0);
+ }
+ catch (const DbException& e)
+ {
+ printf("EnvShutdown exception: %s (%d)\n", e.what(), e.get_errno());
+ }
DbEnv(0).remove(GetDataDir().c_str(), 0);
if (fRemoveLogFiles)
@@ -44,7 +51,7 @@ static void EnvShutdown(bool fRemoveLogFiles)
while (it != filesystem::directory_iterator())
{
const filesystem::path& p = it->path();
-#if BOOST_FILESYSTEM_VERSION == 3
+#if BOOST_FILESYSTEM_VERSION >= 3
std::string f = p.filename().generic_string();
#else
std::string f = p.filename();
@@ -229,7 +236,10 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
CDataStream ssValue;
int ret = db.ReadAtCursor(pcursor, ssKey, ssValue, DB_NEXT);
if (ret == DB_NOTFOUND)
+ {
+ pcursor->close();
break;
+ }
else if (ret != 0)
{
pcursor->close();
@@ -253,14 +263,11 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
}
if (fSuccess)
{
- Db* pdb = mapDb[strFile];
- if (pdb->close(0))
- fSuccess = false;
+ db.Close();
+ CloseDb(strFile);
if (pdbCopy->close(0))
fSuccess = false;
- delete pdb;
delete pdbCopy;
- mapDb[strFile] = NULL;
}
if (fSuccess)
{
Please sign in to comment.
Something went wrong with that request. Please try again.