Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce1c49da authored by Ryan Mitchell's avatar Ryan Mitchell
Browse files

Fix leak of mapped zip central directories 

Memory mapping the central directory of specific APKs caused memory
mappings to build up over time because they were never unmapped
correctly. This is because MappedFile is not calling munmap with the
size of the data after aligning the mmap offset to a page boundary.

Bug: 133463863
Test: install APKs and verify that the entire mapped CD is unmaped
Test: ran aapt2 as daemon and confirmed that mapped CD is unmapped
Change-Id: I26bda27c83615d1a166d92e43a2327909c453b89
parent 2dca1885

base/mapped_file.cpp

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ MappedFile::~MappedFile() { 
  if (base_ != nullptr) UnmapViewOfFile(base_);

  if (handle_ != nullptr) CloseHandle(handle_);

#else

  if (base_ != nullptr) munmap(base_, size_);

  if (base_ != nullptr) munmap(base_, size_ + offset_);

#endif



  base_ = nullptr;