aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authorAndrew Chow <github@achow101.com>2023-06-29 17:18:01 -0400
committerAndrew Chow <github@achow101.com>2023-06-29 17:29:40 -0400
commit561915f35f4f75365c78df939b68c9062d3d3581 (patch)
tree81f7f843e699a9a61f417dcd9a462521bcc7a415 /src/wallet
parentc6287faae4c0e705a9258a340dfcf548906f12af (diff)
parent7c853619ee9ea17a79f1234b6c7871a45ceadcb9 (diff)
downloadbitcoin-561915f35f4f75365c78df939b68c9062d3d3581.tar.xz
Merge bitcoin/bitcoin#27978: refactor: Drop unsafe AsBytePtr function
7c853619ee9ea17a79f1234b6c7871a45ceadcb9 refactor: Drop unsafe AsBytePtr function (Ryan Ofsky) Pull request description: Replace calls to `AsBytePtr` with calls to `AsBytes` or `reinterpret_cast`. `AsBytePtr` is just a wrapper around `reinterpret_cast`. It accepts any type of pointer as an argument and uses `reinterpret_cast` to cast the argument to a `std::byte` pointer. Despite taking any type of pointer as an argument, it is not useful to call `AsBytePtr` on most types of pointers, because byte representations of most types will be platform specific or undefined. Also, because it is named similarly to the `AsBytes` function, `AsBytePtr` looks safer than it actually is. Both `AsBytes` and `AsBytePtr` call reinterpret_cast internally and may be unsafe to use with certain types, but AsBytes at least has some type checking and can only be called on `Span` objects, while `AsBytePtr` can be called on any pointer argument. The change was motivated by discussion on #27973 and #27927 and is compatible with those PRs ACKs for top commit: jonatack: re-ACK 7c853619ee9ea17a79f1234b6c7871a45ceadcb9 sipa: utACK 7c853619ee9ea17a79f1234b6c7871a45ceadcb9 achow101: ACK 7c853619ee9ea17a79f1234b6c7871a45ceadcb9 Tree-SHA512: 200d858b1d4d579f081a7f9a14d488a99713b4918b4564ac3dd5c18578d927dbd6426e62e02f49f04a3fa73ca02ff7109c495cb0b92bec43c27d9b74e2f95757
Diffstat (limited to 'src/wallet')
-rw-r--r--src/wallet/bdb.cpp10
-rw-r--r--src/wallet/sqlite.cpp18
2 files changed, 16 insertions, 12 deletions
diff --git a/src/wallet/bdb.cpp b/src/wallet/bdb.cpp
index 68abdcd81e..658500e456 100644
--- a/src/wallet/bdb.cpp
+++ b/src/wallet/bdb.cpp
@@ -31,6 +31,10 @@
namespace wallet {
namespace {
+Span<const std::byte> SpanFromDbt(const SafeDbt& dbt)
+{
+ return {reinterpret_cast<const std::byte*>(dbt.get_data()), dbt.get_size()};
+}
//! Make sure database has a unique fileid within the environment. If it
//! doesn't, throw an error. BDB caches do not work properly when more than one
@@ -702,7 +706,7 @@ DatabaseCursor::Status BerkeleyCursor::Next(DataStream& ssKey, DataStream& ssVal
return Status::FAIL;
}
- Span<const std::byte> raw_key = {AsBytePtr(datKey.get_data()), datKey.get_size()};
+ Span<const std::byte> raw_key = SpanFromDbt(datKey);
if (!m_key_prefix.empty() && std::mismatch(raw_key.begin(), raw_key.end(), m_key_prefix.begin(), m_key_prefix.end()).second != m_key_prefix.end()) {
return Status::DONE;
}
@@ -711,7 +715,7 @@ DatabaseCursor::Status BerkeleyCursor::Next(DataStream& ssKey, DataStream& ssVal
ssKey.clear();
ssKey.write(raw_key);
ssValue.clear();
- ssValue.write({AsBytePtr(datValue.get_data()), datValue.get_size()});
+ ssValue.write(SpanFromDbt(datValue));
return Status::MORE;
}
@@ -796,7 +800,7 @@ bool BerkeleyBatch::ReadKey(DataStream&& key, DataStream& value)
int ret = pdb->get(activeTxn, datKey, datValue, 0);
if (ret == 0 && datValue.get_data() != nullptr) {
value.clear();
- value.write({AsBytePtr(datValue.get_data()), datValue.get_size()});
+ value.write(SpanFromDbt(datValue));
return true;
}
return false;
diff --git a/src/wallet/sqlite.cpp b/src/wallet/sqlite.cpp
index 8d7fe97bb1..ecd34bb96a 100644
--- a/src/wallet/sqlite.cpp
+++ b/src/wallet/sqlite.cpp
@@ -24,6 +24,12 @@
namespace wallet {
static constexpr int32_t WALLET_SCHEMA_VERSION = 0;
+static Span<const std::byte> SpanFromBlob(sqlite3_stmt* stmt, int col)
+{
+ return {reinterpret_cast<const std::byte*>(sqlite3_column_blob(stmt, col)),
+ static_cast<size_t>(sqlite3_column_bytes(stmt, col))};
+}
+
static void ErrorLogCallback(void* arg, int code, const char* msg)
{
// From sqlite3_config() documentation for the SQLITE_CONFIG_LOG option:
@@ -434,10 +440,8 @@ bool SQLiteBatch::ReadKey(DataStream&& key, DataStream& value)
return false;
}
// Leftmost column in result is index 0
- const std::byte* data{AsBytePtr(sqlite3_column_blob(m_read_stmt, 0))};
- size_t data_size(sqlite3_column_bytes(m_read_stmt, 0));
value.clear();
- value.write({data, data_size});
+ value.write(SpanFromBlob(m_read_stmt, 0));
sqlite3_clear_bindings(m_read_stmt);
sqlite3_reset(m_read_stmt);
@@ -527,12 +531,8 @@ DatabaseCursor::Status SQLiteCursor::Next(DataStream& key, DataStream& value)
value.clear();
// Leftmost column in result is index 0
- const std::byte* key_data{AsBytePtr(sqlite3_column_blob(m_cursor_stmt, 0))};
- size_t key_data_size(sqlite3_column_bytes(m_cursor_stmt, 0));
- key.write({key_data, key_data_size});
- const std::byte* value_data{AsBytePtr(sqlite3_column_blob(m_cursor_stmt, 1))};
- size_t value_data_size(sqlite3_column_bytes(m_cursor_stmt, 1));
- value.write({value_data, value_data_size});
+ key.write(SpanFromBlob(m_cursor_stmt, 0));
+ value.write(SpanFromBlob(m_cursor_stmt, 1));
return Status::MORE;
}