summaryrefslogtreecommitdiff
path: root/libs/ui/GraphicBufferMapper.cpp
diff options
context:
space:
mode:
author Dan Stoza <stoza@google.com> 2015-04-30 21:49:39 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2015-04-30 21:49:40 +0000
commited6e907bc7a259d85c6a6c141a06a06e5c0b224c (patch)
treebef295c19a67f2defbdfe4f2dd46379b8cb140dd /libs/ui/GraphicBufferMapper.cpp
parent08a7c79284dd1cda095b79e5081fea0b0b4ec151 (diff)
parentc7263fb43297744eb04b11025424c0c526d5584c (diff)
Merge "Close Fence FDs in error cases of Surface and GraphicBufferMapper"
Diffstat (limited to 'libs/ui/GraphicBufferMapper.cpp')
-rw-r--r--libs/ui/GraphicBufferMapper.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/ui/GraphicBufferMapper.cpp b/libs/ui/GraphicBufferMapper.cpp
index b03e8d6bd0..90a1c1110d 100644
--- a/libs/ui/GraphicBufferMapper.cpp
+++ b/libs/ui/GraphicBufferMapper.cpp
@@ -164,6 +164,9 @@ status_t GraphicBufferMapper::lockAsyncYCbCr(buffer_handle_t handle,
bounds.left, bounds.top, bounds.width(), bounds.height(),
ycbcr);
} else {
+ if (fenceFd >= 0) {
+ close(fenceFd);
+ }
return -EINVAL; // do not log failure
}