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

Commit b88cc8dc authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am 2db3734e: Merge "Fix benign overflows in ACodec" 

* commit '2db3734e':
  Fix benign overflows in ACodec
parents 56b87a46 2db3734e

media/libstagefright/ACodec.cpp

+4 −2
Original line number Diff line number Diff line
@@ -1327,7 +1327,8 @@ ACodec::BufferInfo *ACodec::dequeueBufferFromNativeWindow() { 
        }



        bool stale = false;

        for (size_t i = mBuffers[kPortIndexOutput].size(); i-- > 0;) {

        for (size_t i = mBuffers[kPortIndexOutput].size(); i > 0;) {

            i--;

            BufferInfo *info = &mBuffers[kPortIndexOutput].editItemAt(i);



            if (info->mGraphicBuffer != NULL &&
@@ -1370,7 +1371,8 @@ ACodec::BufferInfo *ACodec::dequeueBufferFromNativeWindow() { 


    // get oldest undequeued buffer

    BufferInfo *oldest = NULL;

    for (size_t i = mBuffers[kPortIndexOutput].size(); i-- > 0;) {

    for (size_t i = mBuffers[kPortIndexOutput].size(); i > 0;) {

        i--;

        BufferInfo *info =

            &mBuffers[kPortIndexOutput].editItemAt(i);

        if (info->mStatus == BufferInfo::OWNED_BY_NATIVE_WINDOW &&