Skip to content

[Memory] fix BUG crash when ~BitShufflePageDecoder destroys uninitialized chunk #7172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morningman merged 2 commits into from
Nov 23, 2021
Merged

[Memory] fix BUG crash when ~BitShufflePageDecoder destroys uninitialized chunk #7172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8f4ac2
fix bug ~BitShufflePageDecoder destroys uninitialized chunk
xinyiZzz Nov 22, 2021
ef2bdc8
v2
xinyiZzz Nov 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions be/src/olap/rowset/segment_v2/bitshuffle_page.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,9 +216,7 @@ class BitShufflePageDecoder : public PageDecoder {
_cur_index(0) {}

~BitShufflePageDecoder() {
if (_chunk.size != 0) {
ChunkAllocator::instance()->free(_chunk);
}
ChunkAllocator::instance()->free(_chunk);
}

Status init() override {
Expand Down
6 changes: 3 additions & 3 deletions be/src/runtime/memory/chunk.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ namespace doris {
// will result in recompilation of all files. So, we put it in a
// file to keep this file simple and infrequently changed.
struct Chunk {
uint8_t* data;
size_t size;
int core_id;
uint8_t* data = nullptr;
size_t size = 0;
int core_id = -1;
};

} // namespace doris
4 changes: 3 additions & 1 deletion be/src/runtime/memory/chunk_allocator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,9 @@ bool ChunkAllocator::allocate(size_t size, Chunk* chunk) {
}

void ChunkAllocator::free(const Chunk& chunk) {
if (chunk.core_id == -1) {
return;
}
int64_t old_reserved_bytes = _reserved_bytes;
int64_t new_reserved_bytes = 0;
do {
Expand All @@ -190,7 +193,6 @@ void ChunkAllocator::free(const Chunk& chunk) {
_arenas[chunk.core_id]->push_free_chunk(chunk.data, chunk.size);
}


bool ChunkAllocator::allocate_align(size_t size, Chunk* chunk) {
return allocate(BitUtil::RoundUpToPowerOfTwo(size), chunk);
}
Expand Down