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

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

Merge "Fix null pointer dereference" into lmp-dev

parents 3a6a0f9d 9b7db1c5

media/libstagefright/codecs/aacdec/SoftAAC2.cpp

+4 −2
Original line number Diff line number Diff line
@@ -705,7 +705,9 @@ void SoftAAC2::onQueueFilled(OMX_U32 /* portIndex */) { 
                    }



                    // Discard input buffer.

                    if (inHeader) {

                        inHeader->nFilledLen = 0;

                    }



                    aacDecoder_SetParam(mAACDecoder, AAC_TPDEC_CLEAR_BUFFER, 1);
@@ -736,7 +738,7 @@ void SoftAAC2::onQueueFilled(OMX_U32 /* portIndex */) { 
                        notify(OMX_EventPortSettingsChanged, 1, 0, NULL);

                        mOutputPortSettingsChange = AWAITING_DISABLED;



                        if (inHeader->nFilledLen == 0) {

                        if (inHeader && inHeader->nFilledLen == 0) {

                            inInfo->mOwnedByUs = false;

                            mInputBufferCount++;

                            inQueue.erase(inQueue.begin());