commit 8075089ca1a8406043dd76a1586b46cc16891e82
author Tao Bao <tbao@google.com> Thu Feb 09 23:36:09 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 09 23:36:09 2017 +0000
tree b2380e8f70e86581af453c9500a028d846d8bfd3
parent e91a2d23ca6f337c98393b1146aae876344168ce
parent df464dbe79202b62f8b2cf73f45e52d9f32e5e5e

Merge "minui: Save errno before calling close()."
am: df464dbe79

Change-Id: I58e4df9b09b8c6e1470a815180df73d908b98d0a

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;