stagefright: check IMemory::pointer() before using the allocation (8ec845c8) · Commits · e / devices / smdk4412 / android_frameworks_av

media/libstagefright/ACodec.cpp

+6 −2

Original line number	Diff line number	Diff line
		@@ -498,7 +498,9 @@ status_t ACodec::allocateBuffersOnPort(OMX_U32 portIndex) {

		for (OMX_U32 i = 0; i < def.nBufferCountActual; ++i) {
		sp<IMemory> mem = mDealer[portIndex]->allocate(def.nBufferSize);
		CHECK(mem.get() != NULL);
		if (mem == NULL \|\| mem->pointer() == NULL) {
		return NO_MEMORY;
		}

		BufferInfo info;
		info.mStatus = BufferInfo::OWNED_BY_US;
		@@ -755,7 +757,9 @@ status_t ACodec::allocateOutputMetaDataBuffers() {

		sp<IMemory> mem = mDealer[kPortIndexOutput]->allocate(
		sizeof(struct VideoDecoderOutputMetaData));
		CHECK(mem.get() != NULL);
		if (mem == NULL \|\| mem->pointer() == NULL) {
		return NO_MEMORY;
		}
		info.mData = new ABuffer(mem->pointer(), mem->size());

		// we use useBuffer for metadata regardless of quirks