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

Commit 9d8e55cd authored by Truls Bengtsson's avatar Truls Bengtsson Committed by Henrik Baard
Browse files

Initialize pool's buffer pointers to null. 

If these pointers are not properly initialized to null and
allocation of one of the buffers subsequently fail, the freePool
mechanism might erroneously free uninitialized pointers.

Change-Id: I2101bdb2cc576e5f50b5a1440e6fc0c54dc4e81b
parent ffb82943

libvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c

+6 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ M4OSA_ERR VIDEOEDITOR_BUFFER_allocatePool(VIDEOEDITOR_BUFFER_Pool** ppool, 
{

    M4OSA_ERR lerr = M4NO_ERROR;

    VIDEOEDITOR_BUFFER_Pool* pool;

    M4OSA_UInt32 index;



    ALOGV("VIDEOEDITOR_BUFFER_allocatePool : ppool = 0x%x nbBuffers = %d ",

        ppool, nbBuffers);
@@ -79,6 +80,11 @@ M4OSA_ERR VIDEOEDITOR_BUFFER_allocatePool(VIDEOEDITOR_BUFFER_Pool** ppool, 
        goto VIDEOEDITOR_BUFFER_allocatePool_Cleanup;

    }



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

    {

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

    }



    ALOGV("VIDEOEDITOR_BUFFER_allocatePool : Allocating Pool name buffer");

    pool->poolName = M4OSA_NULL;

    pool->poolName = (M4OSA_Char*)M4OSA_32bitAlignedMalloc(