highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-26 17:02:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

walletdb: Handle when database keys are empty

Browse Source
This commit is contained in:
Ryan Ofsky 2023-05-31 15:22:50 -04:00 committed by Andrew Chow
parent 84b2f353bb
commit 1d858b055d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wallet/bdb.cpp
View File

@ -691,7 +691,7 @@ DatabaseCursor::Status BerkeleyCursor::Next(DataStream& ssKey, DataStream& ssVal
if (ret == DB_NOTFOUND) { if (ret == DB_NOTFOUND) {
return Status::DONE; return Status::DONE;
} }
if (ret != 0 || datKey.get_data() == nullptr || datValue.get_data() == nullptr) { if (ret != 0) {
return Status::FAIL; return Status::FAIL;
} }

6
src/wallet/sqlite.cpp
View File

@ -39,7 +39,11 @@ static bool BindBlobToStatement(sqlite3_stmt* stmt,
Span<const std::byte> blob, Span<const std::byte> blob,
const std::string& description) const std::string& description)
{ {
int res = sqlite3_bind_blob(stmt, index, blob.data(), blob.size(), SQLITE_STATIC); // Pass a pointer to the empty string "" below instead of passing the
// blob.data() pointer if the blob.data() pointer is null. Passing a null
// data pointer to bind_blob would cause sqlite to bind the SQL NULL value
// instead of the empty blob value X'', which would mess up SQL comparisons.
int res = sqlite3_bind_blob(stmt, index, blob.data() ? static_cast<const void*>(blob.data()) : "", blob.size(), SQLITE_STATIC);
if (res != SQLITE_OK) { if (res != SQLITE_OK) {
LogPrintf("Unable to bind %s to statement: %s\n", description, sqlite3_errstr(res)); LogPrintf("Unable to bind %s to statement: %s\n", description, sqlite3_errstr(res));
sqlite3_clear_bindings(stmt); sqlite3_clear_bindings(stmt);