commit eafbb21fed36db1b744d4475aac766035dd1ac8a
author liulvping <liulvping@xiaomi.com> Mon Jan 07 21:49:47 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Jan 07 21:49:47 2019 -0800
tree 631ebdbb64a6307b75741b42c39fd020f96e5aac
parent e6baf1a446c08b29191fbe6dea78c5db85963493
parent be2b5dab8842056d2b8e1353a8b3466474c368a7

Merge "fix mmap leak of graphicsstats service" am: 9ebc299b73 am: a2b2a415f0
am: be2b5dab88

Change-Id: I0507151e3394d6d599316b8b90e2fd50af20fdbe

libs/hwui/service/GraphicsStatsService.cpp

diff --git a/libs/hwui/service/GraphicsStatsService.cpp b/libs/hwui/service/GraphicsStatsService.cpp
index 3d50d2d..29e4256 100644
--- a/libs/hwui/service/GraphicsStatsService.cpp
+++ b/libs/hwui/service/GraphicsStatsService.cpp
@@ -139,6 +139,7 @@
     uint32_t file_version = *reinterpret_cast<uint32_t*>(addr);
     if (file_version != sCurrentFileVersion) {
         ALOGW("file_version mismatch! expected %d got %d", sCurrentFileVersion, file_version);
+        munmap(addr, sb.st_size);
         return false;
     }
 
@@ -150,6 +151,7 @@
         ALOGW("Parse failed on '%s' error='%s'", path.c_str(),
               output->InitializationErrorString().c_str());
     }
+    munmap(addr, sb.st_size);
     return success;
 }