commit 8260e06c5095c7688eaede8b8f6d0889a57c7c6b
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 21 17:12:27 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 21 17:12:27 2017 +0000
tree da7d143f68c5b0736dd1e1ca411e1b35f82b6999
parent 9a8ea13a26f8ddc1392943d606fd5282b1b33d87
parent e9147c2d7de146e8d98d58c37bc7ad55abb29dfd

Merge "Avoid closing invalid fds in GraphicBufferMapper"

libs/ui/GraphicBufferMapper.cpp

diff --git a/libs/ui/GraphicBufferMapper.cpp b/libs/ui/GraphicBufferMapper.cpp
index b9fa640..5b0e7f6 100644
--- a/libs/ui/GraphicBufferMapper.cpp
+++ b/libs/ui/GraphicBufferMapper.cpp
@@ -95,7 +95,7 @@
 {
     int32_t fenceFd = -1;
     status_t error = unlockAsync(handle, &fenceFd);
-    if (error == NO_ERROR) {
+    if (error == NO_ERROR && fenceFd >= 0) {
         sync_wait(fenceFd, -1);
         close(fenceFd);
     }