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

Commit 10622437 authored by Danny Fernandes's avatar Danny Fernandes Committed by Android (Google) Code Review
Browse files

Merge "Fix for 3431967 Memory leak in SF shells"

parents a14f4068 2fffed1d

libvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -218,10 +218,10 @@ M4OSA_ERR VIDEOEDITOR_BUFFER_initPoolBuffers(VIDEOEDITOR_BUFFER_Pool* pool, 
        {

        {

            for (j = 0; j < index; j++)

            for (j = 0; j < index; j++)

            {

            {

                if(M4OSA_NULL != pool->pNXPBuffer[index].pData)

                if(M4OSA_NULL != pool->pNXPBuffer[j].pData)

                {

                {

                    M4OSA_free((M4OSA_MemAddr32)pool->pNXPBuffer[index].pData);

                    M4OSA_free((M4OSA_MemAddr32)pool->pNXPBuffer[j].pData);

                    pool->pNXPBuffer[index].pData = M4OSA_NULL;

                    pool->pNXPBuffer[j].pData = M4OSA_NULL;

                }

                }

            }

            }

            err = M4ERR_ALLOC;

            err = M4ERR_ALLOC;

libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -745,9 +745,9 @@ M4OSA_ERR VideoEditorVideoDecoder_configureFromMetadata(M4OSA_Context pContext, 
        cropRight = vWidth - 1;

        cropRight = vWidth - 1;

        cropBottom = vHeight - 1;

        cropBottom = vHeight - 1;





        LOGI("got dimensions only %d x %d", width, height);

        LOGV("got dimensions only %d x %d", width, height);

    } else {

    } else {

        LOGI("got crop rect %d, %d, %d, %d",

        LOGV("got crop rect %d, %d, %d, %d",

             cropLeft, cropTop, cropRight, cropBottom);

             cropLeft, cropTop, cropRight, cropBottom);

    }

    }