mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-12-10 07:22:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10046

Browse Source 
a5b2ad0 BlockchainLMDB: do not assume alignment for alt block entries (jeffro256)
This commit is contained in:
tobtoht
2025-08-30 17:08:26 +00:00
parent 07dcc49bd7 a5b2ad04c5
commit 0229f6fdde
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blockchain_db/lmdb/db_lmdb.cpp
View File

@@ -2399,14 +2399,15 @@ bool BlockchainLMDB::for_all_alt_blocks(std::function<bool(const crypto::hash&,
const crypto::hash &blkid = *(const crypto::hash*)k.mv_data; const crypto::hash &blkid = *(const crypto::hash*)k.mv_data;
if (v.mv_size < sizeof(alt_block_data_t)) if (v.mv_size < sizeof(alt_block_data_t))
throw0(DB_ERROR("alt_blocks record is too small")); throw0(DB_ERROR("alt_blocks record is too small"));
const alt_block_data_t *data = (const alt_block_data_t*)v.mv_data; alt_block_data_t data;
memcpy(&data, v.mv_data, sizeof(data));
cryptonote::blobdata_ref bd; cryptonote::blobdata_ref bd;
if (include_blob) if (include_blob)
{ {
bd = {reinterpret_cast<const char*>(v.mv_data) + sizeof(alt_block_data_t), v.mv_size - sizeof(alt_block_data_t)}; bd = {reinterpret_cast<const char*>(v.mv_data) + sizeof(alt_block_data_t), v.mv_size - sizeof(alt_block_data_t)};
} }
if (!f(blkid, *data, &bd)) { if (!f(blkid, data, &bd)) {
ret = false; ret = false;
break; break;
} }
@@ -4519,11 +4520,10 @@ bool BlockchainLMDB::get_alt_block(const crypto::hash &blkid, alt_block_data_t *
if (v.mv_size < sizeof(alt_block_data_t)) if (v.mv_size < sizeof(alt_block_data_t))
throw0(DB_ERROR("Record size is less than expected")); throw0(DB_ERROR("Record size is less than expected"));
const alt_block_data_t *ptr = (const alt_block_data_t*)v.mv_data;
if (data) if (data)
*data = *ptr; memcpy(data, v.mv_data, sizeof(alt_block_data_t));
if (blob) if (blob)
blob->assign((const char*)(ptr + 1), v.mv_size - sizeof(alt_block_data_t)); blob->assign(((const char*)(v.mv_data)) + sizeof(alt_block_data_t), v.mv_size - sizeof(alt_block_data_t));
TXN_POSTFIX_RDONLY(); TXN_POSTFIX_RDONLY();
return true; return true;