Browse Source

qt: Fix random segfault when closing "Choose data directory" dialog

The `pickDataDirectory()` function was calling `exit(0)` to quit
the application when the user closes the dialog without choosing
a data directory.

This is a bad idea because a background thread is created (to
check free space on the drive of the currently selected datadir).
The thread is not stopped and unwound properly, resulting in a potential
race condition somewhere deep in Qt.

So replace the `exit()` by a boolean return value, and let the
stack unwind normally.
0.14
Wladimir J. van der Laan 8 years ago
parent
commit
b4a9aa511c
  1. 3
      src/qt/bitcoin.cpp
  2. 7
      src/qt/intro.cpp
  3. 5
      src/qt/intro.h

3
src/qt/bitcoin.cpp

@ -578,7 +578,8 @@ int main(int argc, char *argv[])
/// 5. Now that settings and translations are available, ask user for data directory /// 5. Now that settings and translations are available, ask user for data directory
// User language is set up: pick a data directory // User language is set up: pick a data directory
Intro::pickDataDirectory(); if (!Intro::pickDataDirectory())
return 0;
/// 6. Determine availability of data directory and parse bitcoin.conf /// 6. Determine availability of data directory and parse bitcoin.conf
/// - Do not call GetDataDir(true) before this step finishes /// - Do not call GetDataDir(true) before this step finishes

7
src/qt/intro.cpp

@ -165,14 +165,14 @@ QString Intro::getDefaultDataDirectory()
return GUIUtil::boostPathToQString(GetDefaultDataDir()); return GUIUtil::boostPathToQString(GetDefaultDataDir());
} }
void Intro::pickDataDirectory() bool Intro::pickDataDirectory()
{ {
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
QSettings settings; QSettings settings;
/* If data directory provided on command line, no need to look at settings /* If data directory provided on command line, no need to look at settings
or show a picking dialog */ or show a picking dialog */
if(!GetArg("-datadir", "").empty()) if(!GetArg("-datadir", "").empty())
return; return true;
/* 1) Default data directory for operating system */ /* 1) Default data directory for operating system */
QString dataDir = getDefaultDataDirectory(); QString dataDir = getDefaultDataDirectory();
/* 2) Allow QSettings to override default dir */ /* 2) Allow QSettings to override default dir */
@ -190,7 +190,7 @@ void Intro::pickDataDirectory()
if(!intro.exec()) if(!intro.exec())
{ {
/* Cancel clicked */ /* Cancel clicked */
exit(0); return false;
} }
dataDir = intro.getDataDirectory(); dataDir = intro.getDataDirectory();
try { try {
@ -211,6 +211,7 @@ void Intro::pickDataDirectory()
*/ */
if(dataDir != getDefaultDataDirectory()) if(dataDir != getDefaultDataDirectory())
SoftSetArg("-datadir", GUIUtil::qstringToBoostPath(dataDir).string()); // use OS locale for path setting SoftSetArg("-datadir", GUIUtil::qstringToBoostPath(dataDir).string()); // use OS locale for path setting
return true;
} }
void Intro::setStatus(int status, const QString &message, quint64 bytesAvailable) void Intro::setStatus(int status, const QString &message, quint64 bytesAvailable)

5
src/qt/intro.h

@ -35,10 +35,13 @@ public:
/** /**
* Determine data directory. Let the user choose if the current one doesn't exist. * Determine data directory. Let the user choose if the current one doesn't exist.
* *
* @returns true if a data directory was selected, false if the user cancelled the selection
* dialog.
*
* @note do NOT call global GetDataDir() before calling this function, this * @note do NOT call global GetDataDir() before calling this function, this
* will cause the wrong path to be cached. * will cause the wrong path to be cached.
*/ */
static void pickDataDirectory(); static bool pickDataDirectory();
/** /**
* Determine default data directory for operating system. * Determine default data directory for operating system.

Loading…
Cancel
Save