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

Commit 346503bd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "C2SoftAmrNbEnc: Fix integer overflows leading to crash by changing... 

Merge "C2SoftAmrNbEnc:  Fix integer overflows leading to crash by changing data type" am: 30300de1 am: 9f47b40f

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2000475

Change-Id: I6758181a76c06ed2d625116792eb95c707897e30
parents ae1a535c 9f47b40f

media/codec2/components/amr_nb_wb/C2SoftAmrNbEnc.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -225,7 +225,7 @@ void C2SoftAmrNbEnc::process( 
        work->result = C2_CORRUPTED;

        work->result = C2_CORRUPTED;

        return;

        return;

    }

    }

    uint64_t outTimeStamp =

    int64_t outTimeStamp =

        mProcessedSamples * 1000000ll / mIntf->getSampleRate();

        mProcessedSamples * 1000000ll / mIntf->getSampleRate();

    size_t inPos = 0;

    size_t inPos = 0;

    size_t outPos = 0;

    size_t outPos = 0;
@@ -266,7 +266,7 @@ void C2SoftAmrNbEnc::process( 
    ALOGV("causal sample size %d", mFilledLen);

    ALOGV("causal sample size %d", mFilledLen);

    if (mIsFirst && outPos != 0) {

    if (mIsFirst && outPos != 0) {

        mIsFirst = false;

        mIsFirst = false;

        mAnchorTimeStamp = work->input.ordinal.timestamp.peekull();

        mAnchorTimeStamp = work->input.ordinal.timestamp.peekll();

    }

    }

    fillEmptyWork(work);

    fillEmptyWork(work);

    if (outPos != 0) {

    if (outPos != 0) {

media/codec2/components/amr_nb_wb/C2SoftAmrNbEnc.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ private: 
    bool mIsFirst;

    bool mIsFirst;

    bool mSignalledError;

    bool mSignalledError;

    bool mSignalledOutputEos;

    bool mSignalledOutputEos;

    uint64_t mAnchorTimeStamp;

    int64_t mAnchorTimeStamp;

    uint64_t mProcessedSamples;

    uint64_t mProcessedSamples;

    int32_t mFilledLen;

    int32_t mFilledLen;

    int16_t mInputFrame[kNumSamplesPerFrame];

    int16_t mInputFrame[kNumSamplesPerFrame];