commit 26583ffe69a7601ad29e00094fe66ce795356fab
author Marco Nelissen <marcone@google.com> Tue May 03 23:45:10 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 03 23:45:10 2016 +0000
tree 7d2e9ac334cbb050ee6be1ef77a90c36faf2147e
parent 7aa45dd7fc5c2bd959f1571231556ac06b7ec8ae
parent 1863e62d0f49b01b7d066e2d7c47fef249fffd9d

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
am: 1863e62d0f

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

Change-Id: I6b890a1e3964ba6623344414a5a897cc19a84e88

media/libmediaplayerservice/MetadataRetrieverClient.cpp

diff --git a/media/libmediaplayerservice/MetadataRetrieverClient.cpp b/media/libmediaplayerservice/MetadataRetrieverClient.cpp
index bb808e1..793f476 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;
 }