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

Commit dc7357d2 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer" into klp-dev

parents 598f8d32 d85c4490

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

+9 −5
Original line number Diff line number Diff line
@@ -458,6 +458,9 @@ void SoftAAC2::onQueueFilled(OMX_U32 portIndex) { 
                } else {

                    adtsHeaderSize = (protectionAbsent ? 7 : 9);



                    if (aac_frame_length < adtsHeaderSize) {

                        signalError = true;

                    } else {

                        inBuffer[0] = (UCHAR *)adtsHeader + adtsHeaderSize;

                        inBufferLength[0] = aac_frame_length - adtsHeaderSize;
@@ -465,6 +468,7 @@ void SoftAAC2::onQueueFilled(OMX_U32 portIndex) { 
                        inHeader->nFilledLen -= adtsHeaderSize;

                    }

                }

            }



            if (signalError) {

                mSignalledError = true;