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

Commit 1a45cef9 authored by George Burgess IV's avatar George Burgess IV Committed by android-build-merger
Browse files

Merge "nuplayer2: Fix two use-after-frees" am: b6eac609 am: baa7ec9b 

am: ec940867

Change-Id: Iaf7180c6ea33befb4fa6eafb946be4d14f876fa0
parents 66b4c2c7 ec940867

media/libmediaplayer2/nuplayer2/NuPlayer2Drm.cpp

+4 −3
Original line number Original line Diff line number Diff line
@@ -147,9 +147,10 @@ status_t NuPlayer2Drm::retrieveDrmInfo(PsshInfo *psshInfo, PlayerMessage *player 
    }

    }





    uint32_t psshSize = pssh.tellp();

    uint32_t psshSize = pssh.tellp();

    const uint8_t* psshPtr = reinterpret_cast<const uint8_t*>(pssh.str().c_str());

    std::string psshBase = pssh.str();

    const char *psshHex = DrmUUID::arrayToHex(psshPtr, psshSize).string();

    const auto* psshPtr = reinterpret_cast<const uint8_t*>(psshBase.c_str());

    ALOGV("retrieveDrmInfo: MEDIA_DRM_INFO  PSSH: size: %u %s", psshSize, psshHex);

    ALOGV("retrieveDrmInfo: MEDIA_DRM_INFO  PSSH: size: %u %s", psshSize,

            DrmUUID::arrayToHex(psshPtr, psshSize).string());





    // 1) Write PSSH bytes

    // 1) Write PSSH bytes

    playerMsg->add_values()->set_bytes_value(

    playerMsg->add_values()->set_bytes_value(