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

Commit 38f24823 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

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

Change-Id: I77dcc292f32549bd62869b710d3842853a7528fa
parents 08228644 ef1fcffc

media/libmediaplayerservice/MetadataRetrieverClient.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -215,6 +215,7 @@ sp<IMemory> MetadataRetrieverClient::getFrameAtTime(int64_t timeUs, int option) 
    ALOGV("rotation: %d", frameCopy->mRotationAngle);

    ALOGV("rotation: %d", frameCopy->mRotationAngle);

    frameCopy->mData = (uint8_t *)frameCopy + sizeof(VideoFrame);

    frameCopy->mData = (uint8_t *)frameCopy + sizeof(VideoFrame);

    memcpy(frameCopy->mData, frame->mData, frame->mSize);

    memcpy(frameCopy->mData, frame->mData, frame->mSize);

    frameCopy->mData = 0;

    delete frame;  // Fix memory leakage

    delete frame;  // Fix memory leakage

    return mThumbnail;

    return mThumbnail;

}

}