Do not create a map with start == end.

This is not possible in the real world, so prevent this particular case
to avoid leaking memory and any other issues.

Bug: 165619316

Test: Verified the fuzzer test case that caused a leak no longer leaks.
Change-Id: I352b3bd21a4931432e015af89c256ddbcdaa1070
This commit is contained in:
Christopher Ferris 2020-09-01 12:36:26 -07:00
parent af13a8b744
commit c9b6e084a3

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);