Fix crash upon exiting interactive mode if there is no current database.

keepassxreboot · Dec 21, 2019 · dcb092b · dcb092b
1 parent 794cc1e
commit dcb092b
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/cli/keepassxc-cli.cpp b/src/cli/keepassxc-cli.cpp
@@ -149,8 +149,7 @@ void enterInteractiveMode(const QStringList& arguments)
         prompt += "> ";
         command = reader->readLine(prompt);
         if (reader->isFinished()) {
-            currentDatabase->releaseData();
-            return;
+            break;
         }
 
         QStringList args = Utils::splitCommandString(command);
@@ -163,14 +162,17 @@ void enterInteractiveMode(const QStringList& arguments)
             errorTextStream << QObject::tr("Unknown command %1").arg(args[0]) << "\n";
             continue;
         } else if (cmd->name == "quit" || cmd->name == "exit") {
-            currentDatabase->releaseData();
-            return;
+            break;
         }
 
         cmd->currentDatabase = currentDatabase;
         cmd->execute(args);
         currentDatabase = cmd->currentDatabase;
     }
+
+    if (currentDatabase) {
+        currentDatabase->releaseData();
+    }
 }
 
 int main(int argc, char** argv)