Skip to content
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

[1.0.1] Verify index >= 0 in apply_diff and fix warnings #722

Merged
merged 7 commits into from
Sep 10, 2024
+29 −14
Merged

[1.0.1] Verify index >= 0 in apply_diff and fix warnings #722

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e51e299
Verify index >= 0 in apply_diff and fix warnings
linh2931 Sep 9, 2024
d47bf54
Use auto instead of SizeType for updated_index
linh2931 Sep 9, 2024
52f470a
Enfore indices are strictly monotonically increasing and clean up FC_…
linh2931 Sep 10, 2024
417b8af
define container_size_type
linh2931 Sep 10, 2024
8d1f2fe
Remove a duplicate assert
linh2931 Sep 10, 2024
1f6be3e
Ensure Container<T>::size_type is unsigned
linh2931 Sep 10, 2024
2f18e3c
std::forward diff argument in apply_diff()
linh2931 Sep 10, 2024
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
8 changes: 5 additions & 3 deletions libraries/libfc/include/fc/container/ordered_diff.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,17 @@ class ordered_diff {
// Remove from the source based on diff.remove_indexes
std::ptrdiff_t offset = 0;
for (SizeType index : diff.remove_indexes) {
FC_ASSERT(index + offset < container.size(), "diff.remove_indexes index ${idx} + offset ${o} not in range ${s}",
auto updated_index = index + offset;
// Safe to do static_cast as `updated_index >= 0` is verified first
FC_ASSERT(updated_index >= 0 && (static_cast<Container<T>::size_type>(updated_index) < container.size()), "diff.remove_indexes index ${idx} + offset ${o} not in range ${s}",
("idx", index)("o", offset)("s", container.size()));
container.erase(container.begin() + index + offset);
container.erase(container.begin() + updated_index);
--offset;
}

// Insert into the source based on diff.insert_indexes
for (auto& [index, value] : diff.insert_indexes) {
FC_ASSERT(index <= container.size(), "diff.insert_indexes index ${idx} not in range ${s}",
FC_ASSERT(index >= 0 && static_cast<Container<T>::size_type>(index) <= container.size(), "diff.insert_indexes index ${idx} not in range ${s}",
("idx", index)("s", container.size()));
container.insert(container.begin() + index, std::move(value));
}
Expand Down