Merge "Fix potential null ptr after low memory" into sc-dev (504f1761) · Commits · e / os / android_frameworks_av

media/libstagefright/FrameDecoder.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ sp<IMemory> allocVideoFrame(const sp<MetaData>& trackMeta,
		return NULL;
		}
		sp<IMemory> frameMem = new MemoryBase(heap, 0, size);
		if (frameMem == NULL) {
		if (frameMem == NULL \|\| frameMem->unsecurePointer() == NULL) {
		ALOGE("not enough memory for VideoFrame size=%zu", size);
		return NULL;
		}