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

Commit b6b78798 authored by Ray Essick's avatar Ray Essick Committed by Automerger Merge Worker
Browse files

Merge "Fix potential use-after-free issue" into oc-dev am: cb06eeab am: f543f7ff am: abc29d84 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11566487

Change-Id: Ic3e618a12eaac79e04857483ccb1cef606072079
parents 284841d9 abc29d84

media/libmediaplayerservice/nuplayer/NuPlayerStreamListener.cpp

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

      mEOS(false),

      mSendDataNotification(true) {

    mSource->setListener(this);



    mMemoryDealer = new MemoryDealer(kNumBuffers * kBufferSize);

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

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

media/libmediaplayerservice/nuplayer/StreamingSource.cpp

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


void NuPlayer::StreamingSource::start() {

    mStreamListener = new NuPlayerStreamListener(mSource, NULL);

    mSource->setListener(mStreamListener);



    uint32_t sourceFlags = mSource->flags();