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

Commit 75f60435 authored by Abhishek Arya's avatar Abhishek Arya Committed by Android Git Automerger
Browse files

am 527ad688: am 8a83ce9c: am 54ea6c02: am 5ff4bb7a: am 8026ad38: am 6efa86be:... 

am 527ad688: am 8a83ce9c: am 54ea6c02: am 5ff4bb7a: am 8026ad38: am 6efa86be: Merge "Check vector size before accessing" into klp-dev

* commit '527ad688':
  Check vector size before accessing
parents 0742dd1d 527ad688

media/libstagefright/MPEG4Extractor.cpp

+9 −0
Original line number Diff line number Diff line
@@ -3368,8 +3368,17 @@ status_t MPEG4Source::parseSampleAuxiliaryInformationOffsets( 
    int ivlength;

    CHECK(mFormat->findInt32(kKeyCryptoDefaultIVSize, &ivlength));



    // only 0, 8 and 16 byte initialization vectors are supported

    if (ivlength != 0 && ivlength != 8 && ivlength != 16) {

        ALOGW("unsupported IV length: %d", ivlength);

        return ERROR_MALFORMED;

    }

    // read CencSampleAuxiliaryDataFormats

    for (size_t i = 0; i < mCurrentSampleInfoCount; i++) {

        if (i >= mCurrentSamples.size()) {

            ALOGW("too few samples");

            break;

        }

        Sample *smpl = &mCurrentSamples.editItemAt(i);



        memset(smpl->iv, 0, 16);