Commit 5d36fede authored Jul 14, 2016 by Robert Shih Committed by android-build-merger Jul 14, 2016

Merge \\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\"...

Merge \\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\" into klp-dev am: f545c72b am: d89781f3 am: c9c40b82
am: 29f09eb2

Change-Id: Ib65bf1a2dd56dfa84881a18acf0ba1871cdff38c

media/libstagefright/OMXCodec.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -1658,7 +1658,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;