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

Commit 2728e0fe authored by Wonsik Kim's avatar Wonsik Kim Committed by android-build-merger
Browse files

Merge \\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC... 

Merge \\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\" into mnc-dev am: 77effe4b
am: 25515c21

Change-Id: Ie724240ac720d27db1111361a8c0d170d4a6834a
parents 3dee060b 25515c21

media/libstagefright/Utils.cpp

+19 −9
Original line number Diff line number Diff line
@@ -671,20 +671,30 @@ void convertMessageToMetaData(const sp<AMessage> &msg, sp<MetaData> &meta) { 
    // reassemble the csd data into its original form

    sp<ABuffer> csd0;

    if (msg->findBuffer("csd-0", &csd0)) {

        int csd0size = csd0->size();

        if (mime == MEDIA_MIMETYPE_VIDEO_AVC) {

            sp<ABuffer> csd1;

            if (msg->findBuffer("csd-1", &csd1)) {

                char avcc[1024]; // that oughta be enough, right?

                size_t outsize = reassembleAVCC(csd0, csd1, avcc);

                meta->setData(kKeyAVCC, kKeyAVCC, avcc, outsize);

                Vector<char> avcc;

                int avccSize = csd0size + csd1->size() + 1024;

                if (avcc.resize(avccSize) < 0) {

                    ALOGE("error allocating avcc (size %d); abort setting avcc.", avccSize);

                } else {

                    size_t outsize = reassembleAVCC(csd0, csd1, avcc.editArray());

                    meta->setData(kKeyAVCC, kKeyAVCC, avcc.array(), outsize);

                }

            }

        } else if (mime == MEDIA_MIMETYPE_AUDIO_AAC || mime == MEDIA_MIMETYPE_VIDEO_MPEG4) {

            int csd0size = csd0->size();

            char esds[csd0size + 31];

            Vector<char> esds;

            int esdsSize = csd0size + 31;

            if (esds.resize(esdsSize) < 0) {

                ALOGE("error allocating esds (size %d); abort setting esds.", esdsSize);

            } else {

                // The written ESDS is actually for an audio stream, but it's enough

                // for transporting the CSD to muxers.

            reassembleESDS(csd0, esds);

            meta->setData(kKeyESDS, kKeyESDS, esds, sizeof(esds));

                reassembleESDS(csd0, esds.editArray());

                meta->setData(kKeyESDS, kKeyESDS, esds.array(), esds.size());

            }

        }

    }