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

Commit 6471747c authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "stagefright: don't use stale pointer after disconnecting NuCachedSource2" into mnc-dev

parents df3e7e89 2c878cfd

media/libstagefright/NuCachedSource2.cpp

+7 −0
Original line number Original line Diff line number Diff line
@@ -583,6 +583,13 @@ ssize_t NuCachedSource2::readInternal(off64_t offset, void *data, size_t size) { 




    Mutex::Autolock autoLock(mLock);

    Mutex::Autolock autoLock(mLock);





    // If we're disconnecting, return EOS and don't access *data pointer.

    // data could be on the stack of the caller to NuCachedSource2::readAt(),

    // which may have exited already.

    if (mDisconnecting) {

        return ERROR_END_OF_STREAM;

    }



    if (!mFetching) {

    if (!mFetching) {

        mLastAccessPos = offset;

        mLastAccessPos = offset;

        restartPrefetcherIfNecessary_l(

        restartPrefetcherIfNecessary_l(