Fix QSharedPointer initialization

keepassxreboot · Apr 22, 2018 · b45c8b7 · b45c8b7
1 parent ff1e748
commit b45c8b7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/touchid/TouchID.h b/src/touchid/TouchID.h
@@ -27,8 +27,8 @@ class TouchID
         // TouchID(TouchID const&); // Don't Implement
         // void operator=(TouchID const&); // Don't implement
 
-        QSharedPointer<QByteArray> m_encryptedMasterKey = NULL;
-        QSharedPointer<QString> m_databasePath = NULL;
+        QSharedPointer<QByteArray> m_encryptedMasterKey;
+        QSharedPointer<QString> m_databasePath;
         int m_available = -1;
 
     public:

diff --git a/src/touchid/TouchID.mm b/src/touchid/TouchID.mm
@@ -20,7 +20,7 @@ inline void debug(const char* message, ...)
 /* Generates a random AES 256bit key and uses it to encrypt the PasswordKey that protects the database. The encrypted PasswordKey is kept in memory while the AES key is stored in the macOS KeyChain protected by TouchID. */
 bool TouchID::storeKey(const QByteArray& passwordKey, const QString& databasePath)
 {
-    if (this->m_databasePath != NULL && *(this->m_databasePath) == databasePath) {
+    if (!this->m_databasePath.isNull() && *(this->m_databasePath) == databasePath) {
         // already stored key for this database
         debug("TouchID::storeKey - Already stored key for this database");
         return true;
@@ -98,8 +98,8 @@ inline void debug(const char* message, ...)
 
     if (status != errSecSuccess) {
         debug("TouchID::storeKey - Not successful, resetting TouchID");
-        this->m_encryptedMasterKey = NULL;
-        this->m_databasePath = NULL;
+        this->m_encryptedMasterKey.clear();
+        this->m_databasePath.clear();
         return false;
     }
 
@@ -110,8 +110,8 @@ inline void debug(const char* message, ...)
 QSharedPointer<QByteArray> TouchID::getKey(const QString& databasePath) const
 {
     // checks if encrypted PasswordKey is available and is stored for the given database
-    if (this->m_encryptedMasterKey == NULL || 
-        this->m_databasePath == NULL || 
+    if (this->m_encryptedMasterKey.isNull() || 
+        this->m_databasePath.isNull() || 
         *(this->m_databasePath) != databasePath) {
         debug("TouchID::getKey - No stored key found");
         return NULL;
@@ -220,6 +220,6 @@ inline void debug(const char* message, ...)
 /* Resets the inner state */
 void TouchID::reset()
 {
-    this->m_encryptedMasterKey = NULL;
-    this->m_databasePath = NULL;
+    this->m_encryptedMasterKey.clear();
+    this->m_databasePath.clear();
 }