Commit 1cc4b5ab authored by vaclav's avatar vaclav
Browse files

check for memory allocation error before the memory is employed

parent 27f77119

lib_com/cldfb_evs_fx.c

+6 −0
Original line number Diff line number Diff line
@@ -1600,6 +1600,10 @@ ivas_error cldfb_save_memory( 
    move16();

#ifdef FIX_2431_AVOID_CALLOC

    hs->memory = (Word16 *) malloc( ( hs->memory_length + CLDFB_MEM_EXPONENTS + 1 ) * sizeof( Word16 ) );

    IF( hs->memory == NULL )

    {

        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CLDFB\n" );

    }

#else

    hs->memory = (Word16 *) calloc( hs->memory_length + CLDFB_MEM_EXPONENTS + 1, sizeof( Word16 ) );

#endif
@@ -1609,10 +1613,12 @@ ivas_error cldfb_save_memory( 
    Copy( hs->FilterStates_e, hs->memory + hs->memory_length, CLDFB_MEM_EXPONENTS );

    hs->memory[hs->memory_length + CLDFB_MEM_EXPONENTS] = hs->FilterStates_eg;

    move16();

#ifndef FIX_2431_AVOID_CALLOC

    IF( hs->memory == NULL )

    {

        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for CLDFB\n" );

    }

#endif



    return IVAS_ERR_OK;

}