commit 0b4641724b17e12ac6d49cc05a39594bbac22818
author Tao Bao <tbao@google.com> Fri Feb 10 00:00:26 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 10 00:00:26 2017 +0000
tree bd861977257712c80093496d87324661715b672d
parent e799840d8db427590039a7825d92d52f60027ed8
parent 30c164411facb976a3e3738958e5d3567d4e99e0

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

Change-Id: Ifebc398f240364d0afc2d0abd5eba01f07b36d9d

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;