Commit 7c3e69cd authored May 03, 2016 by Marco Nelissen Committed by android-build-merger May 03, 2016

Merge "Clear unused pointer field when sending across binder" into klp-dev am:...

Merge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f17 am: 4b817b51 am: 2d4cf313 am: ef1fcffc am: 38f24823
am: d2c61d04

* commit 'd2c61d04':
  Clear unused pointer field when sending across binder

Change-Id: I5e41f418c9fcdea8bc05c150772a0b87cef101bd

parents 995d39cc d2c61d04

media/libmediaplayerservice/MetadataRetrieverClient.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -210,6 +210,7 @@ sp<IMemory> MetadataRetrieverClient::getFrameAtTime(int64_t timeUs, int option)
		ALOGV("rotation: %d", frameCopy->mRotationAngle);
		frameCopy->mData = (uint8_t *)frameCopy + sizeof(VideoFrame);
		memcpy(frameCopy->mData, frame->mData, frame->mSize);
		frameCopy->mData = 0;
		delete frame; // Fix memory leakage
		return mThumbnail;
		}