commit 71095f174e8b88e008623b4cacd4ec0581b9015c
author Marco Nelissen <marcone@google.com> Tue May 03 23:15:43 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 03 23:15:43 2016 +0000
tree 8bf4ba16286ea7922cf653f1c1240bdb8bea1793
parent c002126cb05b1d640c0a0b51bc0de810a62ab2b1
parent e663be8d475ec6035a1a4257b208549b4375fa08

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

media/libmediaplayerservice/MetadataRetrieverClient.cpp

diff --git a/media/libmediaplayerservice/MetadataRetrieverClient.cpp b/media/libmediaplayerservice/MetadataRetrieverClient.cpp
index 348957f..7e90924 100644
--- a/media/libmediaplayerservice/MetadataRetrieverClient.cpp
+++ b/media/libmediaplayerservice/MetadataRetrieverClient.cpp
@@ -212,6 +212,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;
 }