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

Commit 0cf2616f authored by Andreas Huber's avatar Andreas Huber
Browse files

Return a runtime error if decryption fails instead of asserting. 

Change-Id: Ibab7f2cae3ff7a2e19bc3f31005d5059775a664a
parent 069ee21a

media/libstagefright/httplive/LiveSession.cpp

+8 −2
Original line number Original line Diff line number Diff line
@@ -493,8 +493,14 @@ rinse_repeat: 




    CHECK(buffer != NULL);

    CHECK(buffer != NULL);





    CHECK_EQ((status_t)OK,

    err = decryptBuffer(mSeqNumber - firstSeqNumberInPlaylist, buffer);

             decryptBuffer(mSeqNumber - firstSeqNumberInPlaylist, buffer));



    if (err != OK) {

        LOGE("decryptBuffer failed w/ error %d", err);



        mDataSource->queueEOS(err);

        return;

    }





    if (buffer->size() == 0 || buffer->data()[0] != 0x47) {

    if (buffer->size() == 0 || buffer->data()[0] != 0x47) {

        // Not a transport stream???

        // Not a transport stream???