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

Commit 099e3e7e authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Report a runtime error rather than asserting if the amr software... 

Merge "Report a runtime error rather than asserting if the amr software decoder reads more data than it was given(!)"
parents a0d6b59d bd278758

media/libstagefright/codecs/amrnb/dec/AMRNBDecoder.cpp

+9 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <media/stagefright/MediaBufferGroup.h>

#include <media/stagefright/MediaDebug.h>

#include <media/stagefright/MediaDefs.h>

#include <media/stagefright/MediaErrors.h>

#include <media/stagefright/MetaData.h>



namespace android {
@@ -161,7 +162,14 @@ status_t AMRNBDecoder::read( 


    buffer->set_range(0, kNumSamplesPerFrame * sizeof(int16_t));



    CHECK(numBytesRead <= mInputBuffer->range_length());

    if (numBytesRead > mInputBuffer->range_length()) {

        // This is bad, should never have happened, but did. Abort now.



        buffer->release();

        buffer = NULL;



        return ERROR_MALFORMED;

    }



    mInputBuffer->set_range(

            mInputBuffer->range_offset() + numBytesRead,