commit 26ef0c43859fd505456fe4aa7bf7e6fabb91a237
author Marco Nelissen <marcone@google.com> Tue May 03 23:40:03 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 03 23:40:03 2016 +0000
tree b6044c511f901b0b0718d082227432be343de650
parent cba11f751f7dcc5243f6e29f7bd58513255a5a3d
parent c83479de2497e93311932c03e5cd414a1088e6a2

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

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

Change-Id: Iedb6c73113b84f521f8616116326e1933dcc44e9

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;
 }