ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Close Fence FDs in error cases of Surface and GraphicBufferMapper"

Browse Source
This commit is contained in:
Dan Stoza 2015-04-30 21:49:39 +00:00 committed by Gerrit Code Review
commit ed6e907bc7
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/gui/Surface.cpp
View File

@ -267,6 +267,9 @@ int Surface::cancelBuffer(android_native_buffer_t* buffer,
Mutex::Autolock lock(mMutex); Mutex::Autolock lock(mMutex);
int i = getSlotFromBufferLocked(buffer); int i = getSlotFromBufferLocked(buffer);
if (i < 0) { if (i < 0) {
if (fenceFd >= 0) {
close(fenceFd);
}
return i; return i;
} }
sp<Fence> fence(fenceFd >= 0 ? new Fence(fenceFd) : Fence::NO_FENCE); sp<Fence> fence(fenceFd >= 0 ? new Fence(fenceFd) : Fence::NO_FENCE);
@ -308,6 +311,9 @@ int Surface::queueBuffer(android_native_buffer_t* buffer, int fenceFd) {
} }
int i = getSlotFromBufferLocked(buffer); int i = getSlotFromBufferLocked(buffer);
if (i < 0) { if (i < 0) {
if (fenceFd >= 0) {
close(fenceFd);
}
return i; return i;
} }

3
libs/ui/GraphicBufferMapper.cpp
View File

@ -164,6 +164,9 @@ status_t GraphicBufferMapper::lockAsyncYCbCr(buffer_handle_t handle,
bounds.left, bounds.top, bounds.width(), bounds.height(), bounds.left, bounds.top, bounds.width(), bounds.height(),
ycbcr); ycbcr);
} else { } else {
if (fenceFd >= 0) {
close(fenceFd);
}
return -EINVAL; // do not log failure return -EINVAL; // do not log failure
} }