ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Do not create a map with start == end." am: 6a06520258

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1416434

Change-Id: Ia70ac678c016070361fcfd8d66a5d3dd6e6b561a
This commit is contained in:
Christopher Ferris 2020-09-01 23:33:27 +00:00 • committed by Automerger Merge Worker
commit 49349e69af
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libunwindstack/tests/fuzz/UnwinderComponentCreator.cpp
View file

@ -127,6 +127,13 @@ std::unique_ptr<Maps> GetMaps(FuzzedDataProvider* data_provider) {
for (uint8_t i = 0; i < entry_count; i++) {
uint64_t start = AlignToPage(data_provider->ConsumeIntegral<uint64_t>());
uint64_t end = AlignToPage(data_provider->ConsumeIntegralInRange<uint64_t>(start, UINT64_MAX));
if (start == end) {
// It's impossible to see start == end in the real world, so
// make sure the map contains at least one page of data.
if (__builtin_add_overflow(end, 0x1000, &end)) {
continue;
}
}
// Make sure not to add overlapping maps, that is not something that can
// happen in the real world.
auto entry = map_ends.upper_bound(start);