Merge d84f736ba1 into merged_master (Bitcoin PR bitcoin/bitcoin#29176)

This commit is contained in:
Byron Hambly 2025-11-17 21:16:55 +02:00
commit 8b5cee9cc0
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697

View file

@ -1544,13 +1544,13 @@ bool WalletBatch::EraseRecords(const std::unordered_set<std::string>& types)
}
// Make a copy of key to avoid data being deleted by the following read of the type
Span key_data{key};
const SerializeData key_data{key.begin(), key.end()};
std::string type;
key >> type;
if (types.count(type) > 0) {
if (!m_batch->Erase(key_data)) {
if (!m_batch->Erase(Span{key_data})) {
cursor.reset(nullptr);
m_batch->TxnAbort();
return false; // erase failed