Commit a5cf21b7 authored by vaclav's avatar vaclav
Browse files

error code returns for other malloc() cases

parent a1cad8f9

lib_com/cldfb.c

+3 −6
Original line number Diff line number Diff line
@@ -706,8 +706,7 @@ ivas_error openCldfb( 
    HANDLE_CLDFB_FILTER_BANK hs;

    int16_t buf_len;



    hs = (HANDLE_CLDFB_FILTER_BANK) malloc( sizeof( CLDFB_FILTER_BANK ) );

    if ( hs == NULL )

    if ( ( hs = (HANDLE_CLDFB_FILTER_BANK) malloc( sizeof( CLDFB_FILTER_BANK ) ) ) == NULL )

    {

        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for CLDFB" );

    }
@@ -728,8 +727,7 @@ ivas_error openCldfb( 
        buf_len = hs->p_filter_length;

    }



    hs->cldfb_state = (float *) malloc( buf_len * sizeof( float ) );

    if ( hs->cldfb_state == NULL )

    if ( ( hs->cldfb_state = (float *) malloc( buf_len * sizeof( float ) ) ) == NULL )

    {

        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for CLDFB" );

    }
@@ -1148,8 +1146,7 @@ ivas_error cldfb_save_memory( 
        hs->memory_length = hs->p_filter_length;

    }



    hs->memory = (float *) malloc( hs->memory_length * sizeof( float ) );

    if ( hs->memory == NULL )

    if ( ( hs->memory = (float *) malloc( hs->memory_length * sizeof( float ) ) ) == NULL )

    {

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

    }

lib_com/fd_cng_com.c

+1 −3
Original line number Diff line number Diff line
@@ -68,9 +68,7 @@ ivas_error createFdCngCom( 
    HANDLE_FD_CNG_COM hs;



    /* Allocate memory */

    hs = (HANDLE_FD_CNG_COM) malloc( sizeof( FD_CNG_COM ) );



    if ( hs == NULL )

    if ( ( hs = (HANDLE_FD_CNG_COM) malloc( sizeof( FD_CNG_COM ) ) ) == NULL )

    {

        return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for FD CNG COM" );

    }

lib_com/ivas_prot.h

+4 −4
Original line number Diff line number Diff line
@@ -3346,7 +3346,7 @@ void computeDiffuseness( 
    float *diffuseness 

);



void ivas_dirac_dec_onset_detection_open(

ivas_error ivas_dirac_dec_onset_detection_open(

    const int16_t num_channels,

    const int16_t num_freq_bands,

    const int16_t max_band_decorr,
@@ -3362,7 +3362,7 @@ void ivas_dirac_dec_onset_detection_process( 
    DIRAC_ONSET_DETECTION_STATE h_dirac_onset_detection_state 

);



void ivas_dirac_dec_decorr_open(

ivas_error ivas_dirac_dec_decorr_open(

    DIRAC_DECORR_PARAMS **ph_freq_domain_decorr_ap_params,

    DIRAC_DECORR_STATE **ph_freq_domain_decorr_ap_state,

    const int16_t num_freq_bands,
@@ -3395,7 +3395,7 @@ void ivas_dirac_dec_decorr_close( 
);





void ivas_dirac_dec_output_synthesis_open(

ivas_error  ivas_dirac_dec_output_synthesis_open(

    DIRAC_DEC_HANDLE hDirAC,                                    /* i/o: DirAC handle                                */

    const RENDERER_TYPE renderer_type,                          /* i  : renderer type                               */

    const int16_t nchan_transport,                              /* i  : number of transport channels                */
@@ -3672,7 +3672,7 @@ int16_t svd( 
    const int16_t nChannelsC                                    /* i  : number of columns in the matrix to be decomposed */

);



void ivas_dirac_dec_output_synthesis_cov_open(

ivas_error ivas_dirac_dec_output_synthesis_cov_open(

    DIRAC_OUTPUT_SYNTHESIS_PARAMS *h_dirac_output_synthesis_params,   /* i/o: handle for the covariance synthesis parameters                                                        */

    DIRAC_OUTPUT_SYNTHESIS_COV_STATE *h_dirac_output_synthesis_state, /* i/o: handle for the covariance synthesis state                                                             */

    const int16_t max_band_decorr,                                    /* i  : uppermost frequency band where decorrelation is applied                                               */

lib_com/ivas_qmetadata_com.c

+38 −44
Original line number Diff line number Diff line
@@ -98,9 +98,8 @@ ivas_error ivas_qmetadata_allocate_memory( 
    const int16_t coherence_flag      /* i  : new coherence coding status   */

)

{

    int16_t dir;

    int16_t j, dir;

    uint8_t do_realloc;

    uint8_t reservationFailed = 0;



#ifdef DEBUGGING

    assert( hQMetaData != NULL );
@@ -126,11 +125,12 @@ ivas_error ivas_qmetadata_allocate_memory( 
        hQMetaData->no_directions = ndirs;

        hQMetaData->coherence_flag = coherence_flag;



        hQMetaData->q_direction = (IVAS_QDIRECTION *) malloc( sizeof( IVAS_QDIRECTION ) * ndirs );

        reservationFailed = hQMetaData->q_direction == NULL;



        if ( !reservationFailed )

        if ( ( hQMetaData->q_direction = (IVAS_QDIRECTION *) malloc( sizeof( IVAS_QDIRECTION ) * ndirs ) ) == NULL )

        {

            return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for Q MetaData" );

        }





        for ( dir = 0; dir < hQMetaData->no_directions; dir++ )

        {

            hQMetaData->q_direction[dir].cfg.nbands = nbands;
@@ -140,9 +140,11 @@ ivas_error ivas_qmetadata_allocate_memory( 
            }

            else

            {

                    hQMetaData->q_direction[dir].band_data = (IVAS_QDIRECTION_BAND_DATA *) malloc( sizeof( IVAS_QDIRECTION_BAND_DATA ) * hQMetaData->q_direction[dir].cfg.nbands );

                if ( ( hQMetaData->q_direction[dir].band_data = (IVAS_QDIRECTION_BAND_DATA *) malloc( sizeof( IVAS_QDIRECTION_BAND_DATA ) * hQMetaData->q_direction[dir].cfg.nbands ) ) == NULL )

                {

                        int16_t j;

                    return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for Q MetaData" );

                }



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

                {

                    set_zero( hQMetaData->q_direction[dir].band_data[j].elevation, MAX_PARAM_SPATIAL_SUBFRAMES );
@@ -150,14 +152,9 @@ ivas_error ivas_qmetadata_allocate_memory( 
                }

            }





                    reservationFailed |= hQMetaData->q_direction[dir].band_data == NULL;

                }



            if ( coherence_flag )

            {

                hQMetaData->q_direction[dir].coherence_band_data = (IVAS_QDIRECTION_BAND_COHERENCE_DATA *) malloc( sizeof( IVAS_QDIRECTION_BAND_COHERENCE_DATA ) * hQMetaData->q_direction[dir].cfg.nbands );

                    reservationFailed |= hQMetaData->q_direction[dir].coherence_band_data == NULL;

            }

            else

            {
@@ -173,20 +170,17 @@ ivas_error ivas_qmetadata_allocate_memory( 


        if ( coherence_flag )

        {

                hQMetaData->surcoh_band_data = (IVAS_SURROUND_COHERENCE_BAND_DATA *) malloc( sizeof( IVAS_SURROUND_COHERENCE_BAND_DATA ) * hQMetaData->q_direction[0].cfg.nbands );

                reservationFailed |= hQMetaData->surcoh_band_data == NULL;

            if ( ( hQMetaData->surcoh_band_data = (IVAS_SURROUND_COHERENCE_BAND_DATA *) malloc( sizeof( IVAS_SURROUND_COHERENCE_BAND_DATA ) * hQMetaData->q_direction[0].cfg.nbands ) ) == NULL )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Cannot allocate memory for Q MetaData" );

            }

        }

        else

        {

            hQMetaData->surcoh_band_data = NULL;

        }

    }

    }



    if ( reservationFailed )

    {

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

    }



    return IVAS_ERR_OK;

}

lib_com/wi.c

+1 −3
Original line number Diff line number Diff line
@@ -73,9 +73,7 @@ ivas_error DTFS_new( 
    int16_t i;

    DTFS_STRUCTURE *dtfs = NULL;



    dtfs = (DTFS_STRUCTURE *) malloc( sizeof( DTFS_STRUCTURE ) );



    if ( dtfs == NULL )

    if ( ( dtfs = (DTFS_STRUCTURE *) malloc( sizeof( DTFS_STRUCTURE ) ) ) == NULL )

    {

        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for DTFS (SC-VBR) structure\n" ) );

    }