From e31bb921c4a488bf2602795ab8edfe9b2178bcb6 Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Sat, 6 Mar 2021 00:34:21 +0100 Subject: [PATCH] Fix data race in cached_block --- src/dwarfs/block_cache.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/dwarfs/block_cache.cpp b/src/dwarfs/block_cache.cpp index eee0ca15..47bde1ed 100644 --- a/src/dwarfs/block_cache.cpp +++ b/src/dwarfs/block_cache.cpp @@ -75,8 +75,6 @@ class cached_block { const uint8_t* data() const { return data_.data(); } - size_t size() const { return data_.size(); } - void decompress_until(size_t end) { while (data_.size() < end) { if (!decompressor_) { @@ -575,10 +573,10 @@ block_range::block_range(std::shared_ptr block, if (!block_->data()) { DWARFS_THROW(runtime_error, "block_range: block data is null"); } - if (size > block_->size()) { + if (size > block_->range_end()) { DWARFS_THROW(runtime_error, fmt::format("block_range: size out of range ({0} > {1})", size, - block_->size())); + block_->range_end())); } }