GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 196b459920 into merged_master (Bitcoin PR bitcoin/bitcoin#23438)

Browse source
This commit is contained in:
Byron Hambly 2023-06-28 18:50:02 +00:00
commit a992ccaac2
31 changed files with 218 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/node/blockstorage.cpp
View file

@ -847,8 +847,8 @@ bool ReadRawBlockFromDisk(std::vector<uint8_t>& block, const FlatFilePos& pos, c
}
block.resize(blk_size); // Zeroing of memory is intentional here
filein.read((char*)block.data(), blk_size);
} catch(const std::exception& e) {
filein.read(MakeWritableByteSpan(block));
} catch (const std::exception& e) {
return error("%s: Read from block file failed: %s for %s", __func__, e.what(), pos.ToString());
}