Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26583ffe authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

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

Merge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f17 am: 4b817b51 am: 2d4cf313 am: ef1fcffc am: 38f24823 am: d2c61d04 am: 7c3e69cd am: 5f527d44 am: c83479de am: 26ef0c43
am: 1863e62d

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

Change-Id: I6b890a1e3964ba6623344414a5a897cc19a84e88
parents 7aa45dd7 1863e62d

media/libmediaplayerservice/MetadataRetrieverClient.cpp

+1 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ sp<IMemory> MetadataRetrieverClient::getFrameAtTime(int64_t timeUs, int option) 
    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;

}