Merge "RESTRICT AUTOMERGE Check the buffer index from acquireBuffer" into nyc-mr1-dev (c422235e) · Commits · e / os / android_frameworks_av

media/libstagefright/omx/GraphicBufferSource.cpp

+18 −2

Original line number	Diff line number	Diff line
		@@ -488,6 +488,12 @@ void GraphicBufferSource::suspend(bool suspend) {
		} else if (err != OK) {
		ALOGW("suspend: acquireBuffer returned err=%d", err);
		break;
		} else if (item.mSlot < 0 \|\|
		item.mSlot >= BufferQueue::NUM_BUFFER_SLOTS) {
		// Invalid buffer index
		ALOGW("suspend: corrupted buffer index (%d)",
		item.mSlot);
		break;
		}

		++mNumBufferAcquired;
		@@ -609,6 +615,10 @@ bool GraphicBufferSource::fillCodecBuffer_l() {
		// now what? fake end-of-stream?
		ALOGW("fillCodecBuffer_l: acquireBuffer returned err=%d", err);
		return false;
		} else if (item.mSlot < 0 \|\| item.mSlot >= BufferQueue::NUM_BUFFER_SLOTS) {
		// Invalid buffer index
		ALOGW("fillCodecBuffer_l: corrupted buffer index (%d)", item.mSlot);
		return false;
		}

		mNumBufferAcquired++;
		@@ -982,8 +992,14 @@ void GraphicBufferSource::onFrameAvailable(const BufferItem& /item/) {
		BufferItem item;
		status_t err = mConsumer->acquireBuffer(&item, 0);
		if (err == OK) {
		if (item.mSlot < 0 \|\|
		item.mSlot >= BufferQueue::NUM_BUFFER_SLOTS) {
		// Invalid buffer index
		ALOGW("onFrameAvailable: corrupted buffer index (%d)",
		item.mSlot);
		return;
		}
		mNumBufferAcquired++;

		// If this is the first time we're seeing this buffer, add it to our
		// slot table.
		if (item.mGraphicBuffer != NULL) {