[Sec]: Do not zeroize an empty string

trustwallet · Oct 25, 2023 · 95742cb · 95742cb
1 parent 9959935
commit 95742cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Keystore/StoredKey.cpp b/src/Keystore/StoredKey.cpp
@@ -34,7 +34,9 @@ StoredKey StoredKey::createWithMnemonic(const std::string& name, const Data& pas
 
     Data mnemonicData = TW::Data(mnemonic.begin(), mnemonic.end());
     StoredKey key(StoredKeyType::mnemonicPhrase, name, password, mnemonicData, encryptionLevel, encryption);
-    memzero(mnemonicData.data(), mnemonic.size());
+    if (!mnemonicData.empty()) {
+        memzero(mnemonicData.data(), mnemonic.size());
+    }
     return key;
 }
 

diff --git a/src/interface/TWString.cpp b/src/interface/TWString.cpp
@@ -40,7 +40,9 @@ void TWStringDelete(TWString *_Nonnull string) {
     // `const_cast` is safe here despite that the pointer to the string is const
     // but `std::string` is not a constant value.
     auto *s = const_cast<std::string*>(sConst);
-    memzero(s->data(), s->size());
+    if (!s->empty()) {
+        memzero(s->data(), s->size());
+    }
     delete s;
 }