commit 483445b5c80b46c4861aedc47b549341eafb8601
author Ryan Mitchell <rtmitchell@google.com> Tue May 28 15:42:14 2019 -0700
committer Ryan Mitchell <rtmitchell@google.com> Tue May 28 23:00:04 2019 +0000
tree 1aaaf339cc3cd40d9b07ee7747f7dc5d307dc3fa
parent bee46f3deb90028f76a1d4af9dd5c1ea23b486d5

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: Icb6cfebe0e8d67160fee34c5e6423d0f05de526b

mapped_file.cpp

diff --git a/mapped_file.cpp b/mapped_file.cpp
index 7c65dc3..d26e8ba 100644
--- a/mapped_file.cpp
+++ b/mapped_file.cpp
@@ -76,7 +76,7 @@
   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;