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

Commit a6bf21f2 authored by Chong Zhang's avatar Chong Zhang
Browse files

close fd if data source is reset without prepare 

bug: 18434887
Change-Id: I70dff721710b7299d1ca1f8520278f82d355141d
parent f89f2ff4

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+7 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ NuPlayer::GenericSource::GenericSource( 
      mIsWidevine(false),

      mUIDValid(uidValid),

      mUID(uid),

      mFd(-1),

      mDrmManagerClient(NULL),

      mMetaDataSize(-1ll),

      mBitrate(-1ll),
@@ -70,7 +71,10 @@ void NuPlayer::GenericSource::resetDataSource() { 
    mHttpSource.clear();

    mUri.clear();

    mUriHeaders.clear();

    if (mFd >= 0) {

        close(mFd);

        mFd = -1;

    }

    mOffset = 0;

    mLength = 0;

    setDrmPlaybackStatusIfNeeded(Playback::STOP, 0);
@@ -270,6 +274,7 @@ NuPlayer::GenericSource::~GenericSource() { 
        mLooper->unregisterHandler(id());

        mLooper->stop();

    }

    resetDataSource();

}



void NuPlayer::GenericSource::prepareAsync() {
@@ -312,6 +317,7 @@ void NuPlayer::GenericSource::onPrepareAsync() { 
            mIsWidevine = false;



            mDataSource = new FileSource(mFd, mOffset, mLength);

            mFd = -1;

        }



        if (mDataSource == NULL) {