commit 70cbe1d2e766090e7aed2a62ea2f3a4f834e725e
author Tao Bao <tbao@google.com> Fri Feb 10 00:31:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 10 00:31:29 2017 +0000
tree ff69df8bcd190d40c7a04268afd3e6b363d5443e
parent 6812a80433a247759f5ff1d0c9793b2540354aea
parent 0b4641724b17e12ac6d49cc05a39594bbac22818

Merge "minui: Save errno before calling close()." am: df464dbe79 am: 8075089ca1 am: 30c164411f
am: 0b4641724b

Change-Id: I494ad8c5749290645f9850410789247e35d3bd41

minui/graphics_adf.cpp

diff --git a/minui/graphics_adf.cpp b/minui/graphics_adf.cpp
index 17f30d1..9ab0b06 100644
--- a/minui/graphics_adf.cpp
+++ b/minui/graphics_adf.cpp
@@ -67,8 +67,9 @@
   surf->base.data = static_cast<uint8_t*>(mmap(nullptr, surf->pitch * surf->base.height, PROT_WRITE,
                                                MAP_SHARED, surf->fd, surf->offset));
   if (surf->base.data == MAP_FAILED) {
+    int saved_errno = errno;
     close(surf->fd);
-    return -errno;
+    return -saved_errno;
   }
 
   return 0;