TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-14 23:05:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix data race in cached_block

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2021-03-06 00:34:21 +01:00
parent fa24c37770
commit e31bb921c4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dwarfs/block_cache.cpp
View File

@ -75,8 +75,6 @@ class cached_block {
const uint8_t* data() const { return data_.data(); } const uint8_t* data() const { return data_.data(); }
size_t size() const { return data_.size(); }
void decompress_until(size_t end) { void decompress_until(size_t end) {
while (data_.size() < end) { while (data_.size() < end) {
if (!decompressor_) { if (!decompressor_) {
@ -575,10 +573,10 @@ block_range::block_range(std::shared_ptr<cached_block const> block,
if (!block_->data()) { if (!block_->data()) {
DWARFS_THROW(runtime_error, "block_range: block data is null"); DWARFS_THROW(runtime_error, "block_range: block data is null");
} }
if (size > block_->size()) { if (size > block_->range_end()) {
DWARFS_THROW(runtime_error, DWARFS_THROW(runtime_error,
fmt::format("block_range: size out of range ({0} > {1})", size, fmt::format("block_range: size out of range ({0} > {1})", size,
block_->size())); block_->range_end()));
} }
} }