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

Commit 6efa86be authored by Abhishek Arya's avatar Abhishek Arya Committed by Android (Google) Code Review
Browse files

Merge "Check vector size before accessing" into klp-dev

parents 6f561b93 073e4f67
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -2747,8 +2747,17 @@ status_t MPEG4Source::parseSampleAuxiliaryInformationOffsets(off64_t offset, off
    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);