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

Commit ec940867 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

Change-Id: Idf13fe90334462de5f30b04f25b1e0a7c1dc8709
parents 7b8cad4e baa7ec9b

media/libmediaplayer2/nuplayer2/NuPlayer2Drm.cpp

+4 −3
Original line number Diff line number Diff line
@@ -148,9 +148,10 @@ sp<ABuffer> NuPlayer2Drm::retrieveDrmInfo(PsshInfo *psshInfo) 
    }



    uint32_t psshSize = pssh.tellp();

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

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

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

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

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

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

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



    // 1) Write PSSH bytes

    drmInfo.write(reinterpret_cast<const char *>(&psshSize), sizeof(psshSize));