commit 67b66183fe61af3a4f501fb2b07e8d61074b2ebb
author Elliott Hughes <enh@google.com> Wed Dec 16 18:44:31 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 16 18:44:31 2015 +0000
tree 00ca4a6a045191ceb0e97a0eabeeb2f26968f4e7
parent 454b0984c11454222f48dffeb34ee40b1cc0b734
parent 28a71c32e3e18009e2cd48046762ab0ecda1451d

Merge "Make host ashmem_create_region more robust." am: ec2f506e74
am: 6ed33e5ada

* commit '6ed33e5ada7e7a1f7d4f0a0407850021169893d3':
  Make host ashmem_create_region more robust.

libcutils/ashmem-host.c

diff --git a/libcutils/ashmem-host.c b/libcutils/ashmem-host.c
index abc4f94..15dd43e 100644
--- a/libcutils/ashmem-host.c
+++ b/libcutils/ashmem-host.c
@@ -43,11 +43,16 @@
     char template[PATH_MAX];
     snprintf(template, sizeof(template), "/tmp/android-ashmem-%d-XXXXXXXXX", getpid());
     int fd = mkstemp(template);
-    if (fd != -1 && TEMP_FAILURE_RETRY(ftruncate(fd, size)) != -1 && unlink(template) != -1) {
-        return fd;
+    if (fd == -1) return -1;
+
+    unlink(template);
+
+    if (TEMP_FAILURE_RETRY(ftruncate(fd, size)) == -1) {
+      close(fd);
+      return -1;
     }
-    close(fd);
-    return -1;
+
+    return fd;
 }
 
 int ashmem_set_prot_region(int fd __unused, int prot __unused)