Commit 6ff5e145 authored by vaclav's avatar vaclav
Browse files

issue 1388: fix use-of-uninitialized value in ivas_init_decoder(); under... 

issue 1388: fix use-of-uninitialized value in ivas_init_decoder(); under FIX_1388_MSAN_ivas_init_decoder
parent ab5ed9bb

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ 
#define FIX_1119_SPLIT_RENDERING_VOIP                   /* FhG: Add split rendering support to decoder in VoIP mode */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define FIX_1377_HANDLE_ERROR_CODE                      /* Eri: Add missing error code handling from IVAS_REND_SetObjectIDs */

#define FIX_1388_MSAN_ivas_init_decoder                 /* VA: issue 1388: fix use-of-uninitialized value in ivas_init_decoder() */



/* #################### End BE switches ################################## */

lib_dec/lib_dec.c

+14 −0
Original line number Diff line number Diff line
@@ -857,12 +857,23 @@ ivas_error IVAS_DEC_FeedFrame_Serial( 
{

    ivas_error error;



#ifdef FIX_1388_MSAN_ivas_init_decoder

    if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL )

    {

        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }



#endif

    if ( !hIvasDec->isInitialized )

    {

        /* Once first frame is fed, finish initialization in EVS Mono.

         * In IVAS mode, initialization is done in ivas_dec(). */

        if ( hIvasDec->mode == IVAS_DEC_MODE_EVS )

        {

#ifdef FIX_1388_MSAN_ivas_init_decoder

            hIvasDec->st_ivas->hDecoderConfig->ivas_total_brate = ACELP_8k00;



#endif

            if ( ( error = ivas_init_decoder( hIvasDec->st_ivas ) ) != IVAS_ERR_OK )

            {

                return error;
@@ -875,10 +886,12 @@ ivas_error IVAS_DEC_FeedFrame_Serial( 
                st->prev_use_partial_copy = 0;

                hIvasDec->st_ivas->hDecoderConfig->ivas_total_brate = hIvasDec->hVoIP->hCurrentDataUnit->dataSize * FRAMES_PER_SEC;

            }

#ifndef FIX_1388_MSAN_ivas_init_decoder

            else

            {

                hIvasDec->st_ivas->hDecoderConfig->ivas_total_brate = ACELP_8k00;

            }

#endif

            hIvasDec->isInitialized = true;

        }

    }
@@ -908,6 +921,7 @@ ivas_error IVAS_DEC_FeedFrame_Serial( 
            bfi = 2;

        }

    }



    if ( ( error = read_indices( hIvasDec->st_ivas, serial, num_bits, &hIvasDec->prev_ft_speech, &hIvasDec->CNG, bfi ) ) != IVAS_ERR_OK )

    {

        return error;