am 1d3612f1: am 2a8c49eb: fix an out-of-bounds memory access

* commit '1d3612f11cb0a56062059dad4643657750c23aab':
  fix an out-of-bounds memory access
This commit is contained in:
Mathias Agopian 2012-11-19 15:14:08 -08:00 committed by Android Git Automerger
commit c208cdd402

View File

@ -314,13 +314,15 @@ status_t BufferQueue::dequeueBuffer(int *outBuf, sp<Fence>& outFence,
* the consumer may still have pending reads of the * the consumer may still have pending reads of the
* buffers in flight. * buffers in flight.
*/ */
if (found >= 0) {
bool isOlder = mSlots[i].mFrameNumber < bool isOlder = mSlots[i].mFrameNumber <
mSlots[found].mFrameNumber; mSlots[found].mFrameNumber;
if (found < 0 || isOlder) { if (isOlder) {
found = i; found = i;
} }
} }
} }
}
// clients are not allowed to dequeue more than one buffer // clients are not allowed to dequeue more than one buffer
// if they didn't set a buffer count. // if they didn't set a buffer count.