Skip to content

RDB: fix Endian handling in rdb_intset #1830

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
merged 2 commits into from
Oct 16, 2023
Merged

RDB: fix Endian handling in rdb_intset #1830

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4e350f
tiny fix be handling
mapleFU Oct 16, 2023
71d5859
bugfix: wrong memrev integer type
mapleFU Oct 16, 2023
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
10 changes: 5 additions & 5 deletions src/storage/rdb_intset.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ StatusOr<std::vector<std::string>> IntSet::Entries() {
uint32_t encoding = 0, len = 0;
memcpy(&encoding, input_.data() + pos_, sizeof(uint32_t));
pos_ += sizeof(uint32_t);
intrev32ifbe(&encoding);
memrev32ifbe(&encoding);
memcpy(&len, input_.data() + pos_, sizeof(uint32_t));
pos_ += sizeof(uint32_t);
intrev32ifbe(&len);
memrev32ifbe(&len);

uint32_t record_size = encoding;
if (record_size == 0) {
Expand All @@ -60,23 +60,23 @@ StatusOr<std::vector<std::string>> IntSet::Entries() {
uint16_t v = 0;
memcpy(&v, input_.data() + pos_, sizeof(uint16_t));
pos_ += sizeof(uint16_t);
intrev16ifbe(&v);
memrev16ifbe(&v);
entries.emplace_back(std::to_string(v));
break;
}
case IntSetEncInt32: {
uint32_t v = 0;
memcpy(&v, input_.data() + pos_, sizeof(uint32_t));
pos_ += sizeof(uint32_t);
intrev32ifbe(&v);
memrev32ifbe(&v);
entries.emplace_back(std::to_string(v));
break;
}
case IntSetEncInt64: {
uint64_t v = 0;
memcpy(&v, input_.data() + pos_, sizeof(uint64_t));
pos_ += sizeof(uint64_t);
intrev64ifbe(&v);
memrev64ifbe(&v);
entries.emplace_back(std::to_string(v));
break;
}
Expand Down