The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-11-23 13:39:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correct IntervalMap insertion end calculation

Browse Source 
The `end` pointer for `interval` was incorrectly calculated as `interval.data() + interval.size_bytes()` which would be incorrect when the interval span type is not `u8` as the pointer derived from `interval.data()` would be a pointer to the span type rather than a byte pointer and be subject to arithmetic of that object's size rather than in terms of a byte.
This commit is contained in:
PixelyIon 2022-07-01 19:49:10 +05:30
parent b0910e7b1a
commit a6599c30b4
No known key found for this signature in database
GPG Key ID: 11BC6C3201BC2C05
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/cpp/skyline/common/interval_map.h
View File

@ -51,7 +51,7 @@ namespace skyline {
EntryGroup(span<span<T>> lIntervals, EntryType value) : value(std::move(value)) { EntryGroup(span<span<T>> lIntervals, EntryType value) : value(std::move(value)) {
intervals.reserve(lIntervals.size()); intervals.reserve(lIntervals.size());
for (const auto &interval : lIntervals) for (const auto &interval : lIntervals)
intervals.emplace_back(interval.data(), interval.data() + interval.size_bytes()); intervals.emplace_back(interval.data(), interval.data() + interval.size());
} }
}; };
@ -115,7 +115,7 @@ namespace skyline {
GroupHandle Insert(span<span<T>> intervals, EntryType value) requires std::is_pointer_v<AddressType> { GroupHandle Insert(span<span<T>> intervals, EntryType value) requires std::is_pointer_v<AddressType> {
GroupHandle group{groups.emplace(groups.begin(), intervals, std::move(value))}; GroupHandle group{groups.emplace(groups.begin(), intervals, std::move(value))};
for (const auto &interval : intervals) for (const auto &interval : intervals)
entries.emplace(std::lower_bound(entries.begin(), entries.end(), interval.data()), interval.data(), interval.data() + interval.size_bytes(), group); entries.emplace(std::lower_bound(entries.begin(), entries.end(), interval.data()), interval.data(), interval.data() + interval.size(), group);
return group; return group;
} }