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

Commit 557bdaa8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix potential use-after-free issue" into rvc-dev

parents d9ea5054 aad519df

media/libmediaplayerservice/nuplayer/NuPlayerStreamListener.cpp

+0 −2
Original line number Original line Diff line number Diff line
@@ -34,8 +34,6 @@ NuPlayer::NuPlayerStreamListener::NuPlayerStreamListener( 
      mTargetHandler(targetHandler),

      mTargetHandler(targetHandler),

      mEOS(false),

      mEOS(false),

      mSendDataNotification(true) {

      mSendDataNotification(true) {

    mSource->setListener(this);



    mMemoryDealer = new MemoryDealer(kNumBuffers * kBufferSize);

    mMemoryDealer = new MemoryDealer(kNumBuffers * kBufferSize);

    for (size_t i = 0; i < kNumBuffers; ++i) {

    for (size_t i = 0; i < kNumBuffers; ++i) {

        sp<IMemory> mem = mMemoryDealer->allocate(kBufferSize);

        sp<IMemory> mem = mMemoryDealer->allocate(kBufferSize);

media/libmediaplayerservice/nuplayer/StreamingSource.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -79,6 +79,7 @@ void NuPlayer::StreamingSource::prepareAsync() { 




void NuPlayer::StreamingSource::start() {

void NuPlayer::StreamingSource::start() {

    mStreamListener = new NuPlayerStreamListener(mSource, NULL);

    mStreamListener = new NuPlayerStreamListener(mSource, NULL);

    mSource->setListener(mStreamListener);





    uint32_t sourceFlags = mSource->flags();

    uint32_t sourceFlags = mSource->flags();