commit 2811381bf8d481755f9159f6beef5aa44af743ac
author Marco Nelissen <marcone@google.com> Mon May 02 14:12:34 2016 -0700
committer The Android Automerger <android-build@google.com> Fri May 27 10:27:36 2016 -0700
tree 2d308e0650e3424dc9757fec3264cd1e01744167
parent ffc9b40550b4bca811ebc33317f115570cb1560a

Clear unused pointer field when sending across binder

Bug: 28377502
Change-Id: Iad5ebfb0a9ef89f09755bb332579dbd3534f9c98

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