Merge pull request #413 from rdoeffinger/bugfixes

Bugfixes
IJHack · Sep 25, 2018 · d5f9939 · d5f9939
2 parents 4fe1a73 + 68490dc
commit d5f9939
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 14 deletions.
diff --git a/qtpass.pri b/qtpass.pri
@@ -6,7 +6,7 @@ CONFIG(coverage) {
 }
 
 CONFIG(debug, debug|release) {
-    QMAKE_CXXFLAGS += -g -c -Wall -O0
+    !msvc:QMAKE_CXXFLAGS += -g -c -Wall -O0
     QMAKE_LFLAGS += -O0
 }
 

diff --git a/src/executor.cpp b/src/executor.cpp
@@ -198,7 +198,7 @@ void Executor::finished(int exitCode, QProcess::ExitStatus exitStatus) {
     QTextCodec *codec = QTextCodec::codecForLocale();
     if (i.readStdout)
       output = codec->toUnicode(m_process.readAllStandardOutput());
-    if (i.readStderr or exitCode != 0) {
+    if (i.readStderr || exitCode != 0) {
       err = codec->toUnicode(m_process.readAllStandardError());
       if (exitCode != 0)
         dbg() << exitCode << err;

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -411,8 +411,12 @@ void MainWindow::config() {
       this->show();
 
       updateProfileBox();
-      ui->treeView->setRootIndex(proxyModel.mapFromSource(
-          model.setRootPath(QtPassSettings::getPassStore())));
+      // For freshStart, proxyModel is not yet configured
+      // and maniplating it will assert
+      if (!freshStart) {
+          ui->treeView->setRootIndex(proxyModel.mapFromSource(
+              model.setRootPath(QtPassSettings::getPassStore())));
+      }
 
       if (freshStart && Util::checkConfig())
         config();

diff --git a/src/qtpasssettings.cpp b/src/qtpasssettings.cpp
@@ -8,8 +8,12 @@
 bool QtPassSettings::initialized = false;
 
 Pass *QtPassSettings::pass;
-RealPass QtPassSettings::realPass;
-ImitatePass QtPassSettings::imitatePass;
+// Go via pointer to avoid dynamic initialization,
+// due to "random" initialization order realtive to other
+// globals, especially around QObject emtadata dynamic initialization
+// can lead to crashes depending on compiler, linker etc.
+QScopedPointer<RealPass> QtPassSettings::realPass;
+QScopedPointer<ImitatePass> QtPassSettings::imitatePass;
 
 QtPassSettings *QtPassSettings::m_instance = nullptr;
 QtPassSettings *QtPassSettings::getInstance() {
@@ -83,9 +87,9 @@ void QtPassSettings::setProfiles(const QHash<QString, QString> &profiles) {
 Pass *QtPassSettings::getPass() {
   if (!pass) {
     if (isUsePass()) {
-      QtPassSettings::pass = &QtPassSettings::realPass;
+      QtPassSettings::pass = getRealPass();
     } else {
-      QtPassSettings::pass = &QtPassSettings::imitatePass;
+      QtPassSettings::pass = getImitatePass();
     }
     pass->init();
   }
@@ -149,9 +153,9 @@ bool QtPassSettings::isUsePass(const bool &defaultValue) {
 }
 void QtPassSettings::setUsePass(const bool &usePass) {
   if (usePass) {
-    QtPassSettings::pass = &QtPassSettings::realPass;
+    QtPassSettings::pass = getRealPass();
   } else {
-    QtPassSettings::pass = &QtPassSettings::imitatePass;
+    QtPassSettings::pass = getImitatePass();
   }
   getInstance()->setValue(SettingsConstants::usePass, usePass);
 }
@@ -527,5 +531,5 @@ void QtPassSettings::setTemplateAllFields(const bool &templateAllFields) {
                           templateAllFields);
 }
 
-RealPass *QtPassSettings::getRealPass() { return &realPass; }
-ImitatePass *QtPassSettings::getImitatePass() { return &imitatePass; }
+RealPass *QtPassSettings::getRealPass() { if (realPass.isNull()) realPass.reset(new RealPass()); return realPass.data(); }
+ImitatePass *QtPassSettings::getImitatePass() { if (imitatePass.isNull()) imitatePass.reset(new ImitatePass()); return imitatePass.data(); }
diff --git a/src/qtpasssettings.h b/src/qtpasssettings.h
@@ -33,8 +33,8 @@ class QtPassSettings : public QSettings {
   static QtPassSettings *m_instance;
 
   static Pass *pass;
-  static RealPass realPass;
-  static ImitatePass imitatePass;
+  static QScopedPointer<RealPass> realPass;
+  static QScopedPointer<ImitatePass> imitatePass;
 
 public:
   static QtPassSettings *getInstance();