From 18fd20f898681126e6014c092047ca2ed1aa5f0a Mon Sep 17 00:00:00 2001
From: Gianluca Recchia <gianluca.recchia97@gmail.com>
Date: Sun, 28 Oct 2018 11:39:15 +0100
Subject: [PATCH] Remove redundant null-checks for pointer deletion

Deleting a null pointer is defined behavior and results in a no-op at
the assembly level, so it's perfectly safe.
---
 src/gui/DatabaseOpenWidget.cpp | 10 +++++-----
 src/gui/KeePass1OpenWidget.cpp |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gui/DatabaseOpenWidget.cpp b/src/gui/DatabaseOpenWidget.cpp
index 67af3ff1..892c41d3 100644
--- a/src/gui/DatabaseOpenWidget.cpp
+++ b/src/gui/DatabaseOpenWidget.cpp
@@ -143,7 +143,7 @@ void DatabaseOpenWidget::load(const QString& filename)
 
     QHash<QString, QVariant> useTouchID = config()->get("UseTouchID").toHash();
     m_ui->checkTouchID->setChecked(useTouchID.value(m_filename, false).toBool());
-    
+
     m_ui->editPassword->setFocus();
 }
 
@@ -195,9 +195,9 @@ void DatabaseOpenWidget::openDatabase()
                                          MessageWidget::Error);
         return;
     }
-    if (m_db) {
-        delete m_db;
-    }
+
+    delete m_db;
+
     QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
     m_db = reader.readDatabase(&file, masterKey);
     QApplication::restoreOverrideCursor();
@@ -254,7 +254,7 @@ QSharedPointer<CompositeKey> DatabaseOpenWidget::databaseKey()
             // check if the user cancelled the operation
             if (passwordKey.isNull())
                 return QSharedPointer<CompositeKey>();
-            
+
             masterKey->addKey(PasswordKey::fromRawKey(*passwordKey));
         }
     }
diff --git a/src/gui/KeePass1OpenWidget.cpp b/src/gui/KeePass1OpenWidget.cpp
index 4a54aaf3..8123d239 100644
--- a/src/gui/KeePass1OpenWidget.cpp
+++ b/src/gui/KeePass1OpenWidget.cpp
@@ -53,9 +53,9 @@ void KeePass1OpenWidget::openDatabase()
                                          MessageWidget::Error);
         return;
     }
-    if (m_db) {
-        delete m_db;
-    }
+
+    delete m_db;
+
     QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
     m_db = reader.readDatabase(&file, password, keyFileName);
     QApplication::restoreOverrideCursor();