Merge \\"OMXCodec: check IMemory::pointer() before using allocation\\" into klp-dev am: f545c72b97 (c9c40b82) · Commits · e / devices / smdk4412 / android_frameworks_av

media/libstagefright/OMXCodec.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -1571,7 +1571,9 @@ status_t OMXCodec::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.mData = NULL;