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

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

Merge \\\\\\\\\\"OMXCodec: check IMemory::pointer() before using allocation\\\\\\\\\\" into klp-dev am: f545c72b am: d89781f3 am: c9c40b82 am: 29f09eb2 am: 5d36fede am: a17d7c03 am: 83d7bdbc am: f43ad654 am: b2aeed2d
am: e46d450c

Change-Id: I9cc745c824801e9f15dcef233a87d018e965d758

media/libstagefright/OMXCodec.cpp

+3 −1

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