commit d27a3d7853bcbf537ccaf440228a469e154f72ad
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 21 02:14:21 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 21 02:14:21 2018 +0000
tree aa6ec7d58ea217aa966d0b711e507c7bb8e364d2
parent e510d9c369d76a5935501ebb4ba82984767060b2
parent cb4d42173e008217ecb75ef7669d1c41be6ae0c7

Merge "Fix mmap leak in MmapFile"

libc/bionic/grp_pwd_file.cpp

diff --git a/libc/bionic/grp_pwd_file.cpp b/libc/bionic/grp_pwd_file.cpp
index 911daea..4b8b8a9 100644
--- a/libc/bionic/grp_pwd_file.cpp
+++ b/libc/bionic/grp_pwd_file.cpp
@@ -233,7 +233,7 @@
 
   auto mmap_size = fd_stat.st_size;
 
-  const void* map_result = mmap(nullptr, mmap_size, PROT_READ, MAP_SHARED, fd, 0);
+  void* map_result = mmap(nullptr, mmap_size, PROT_READ, MAP_SHARED, fd, 0);
   close(fd);
 
   if (map_result == MAP_FAILED) {
@@ -243,7 +243,12 @@
   start_ = static_cast<const char*>(map_result);
   end_ = start_ + mmap_size - 1;
 
-  return *end_ == '\n';
+  if (*end_ != '\n') {
+    munmap(map_result, mmap_size);
+    return false;
+  }
+
+  return true;
 }
 
 template <typename Line, typename Predicate>