commit 1863e62d0f49b01b7d066e2d7c47fef249fffd9d
author Marco Nelissen <marcone@google.com> Tue May 03 23:42:32 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 03 23:42:32 2016 +0000
tree ca6f522b9a1ed41db5590c75cd4fa392dd2f16ea
parent a4672c43a771ab42260382f293cbfe6bddc62816
parent 26ef0c43859fd505456fe4aa7bf7e6fabb91a237

Merge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa am: ef1fcffc98 am: 38f24823d0 am: d2c61d049b am: 7c3e69cd12 am: 5f527d44d7 am: c83479de24
am: 26ef0c4385

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

Change-Id: I9c66605afa05d147f0018d6f2c650ec0811dd1ac

media/libmediaplayerservice/MetadataRetrieverClient.cpp

diff --git a/media/libmediaplayerservice/MetadataRetrieverClient.cpp b/media/libmediaplayerservice/MetadataRetrieverClient.cpp
index a5a1fa5..f6acdf6 100644
--- a/media/libmediaplayerservice/MetadataRetrieverClient.cpp
+++ b/media/libmediaplayerservice/MetadataRetrieverClient.cpp
@@ -231,6 +231,7 @@
     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;
 }