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

Commit 12d3f380 authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge \\\\\\"SoftAAC2: fix crash on all-zero adts buffer\\\\\\" into lmp-dev... 

Merge \\\\\\"SoftAAC2: fix crash on all-zero adts buffer\\\\\\" into lmp-dev am: 5979fb9e am: 6f16bd8a am: 2b105198 am: b232a6be am: fa35d945
am: 96deca77

Change-Id: I136001e8650fc5c2497a732d870100c9240c4cfd
parents b13e845d 96deca77

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

+9 −6
Original line number Diff line number Diff line
@@ -625,7 +625,9 @@ void SoftAAC2::onQueueFilled(OMX_U32 /* portIndex */) { 
                        signalError = true;

                    } else {

                        adtsHeaderSize = (protectionAbsent ? 7 : 9);



                        if (aac_frame_length < adtsHeaderSize) {

                            signalError = true;

                        } else {

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

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

                        }

                    }

                }



                if (signalError) {

                    mSignalledError = true;