Commit 9f19bcdc authored by vaclav's avatar vaclav
Browse files

Merge branch... 

Merge branch 'float-1525-format-switching-reading-of-uninitialized-memory-in-ivas_dec_readformat' into 'main'

Fix reading of uninitialized memory in format switching

See merge request !2546
parents 7c02c866 873dd04b

apps/decoder.c

+10 −1
Original line number Diff line number Diff line
@@ -3371,6 +3371,10 @@ static ivas_error decodeVoIP( 


            *phIvasDec = hIvasDec; /* Update for main()' s free */

            ivasRtp.restartNeeded = false;

#ifdef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC

            bitstreamReadDone = false;

            parametersAvailableForEditing = false;

#endif

        }



        /* reference vector */
@@ -3619,6 +3623,10 @@ static ivas_error decodeVoIP( 
                        goto cleanup;

                    }

                    *phIvasDec = hIvasDec; /* Update for main()' s free */

#ifdef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC

                    bitstreamReadDone = false;

                    parametersAvailableForEditing = false;

#endif

                }



                /* Placeholder for memory reallocation */
@@ -4377,12 +4385,13 @@ static ivas_error restartDecoder( 
        }

    }



#ifndef FIX_1525_UNINIT_FORMAT_SWITCHING_DEC

    if ( ( error = IVAS_DEC_PrintConfig( hIvasDec, 1, arg->voipMode ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

        goto cleanup;

    }



#endif

    /* ISAR frame size is set from command line, not renderer config file.

     * This will be ignored if output format is not split rendering. */

    if ( renderConfig != NULL )

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ 
#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_FLOAT_1535_ARI_RES_Q_CLEANUP                /* FhG: remove dead code from tcx_ari_res_Q_spec() */

#define FIX_FLOAT_1536_INIT_NO_PARAM_LPC                /* FhG: make sure no_param_lpc is initialized in core_encode_twodiv() */

#define FIX_1525_UNINIT_FORMAT_SWITCHING_DEC            /* VA: float issue 1525: fix reading of uninitialized memory in format switching at the decoder */



/* #################### End BE switches ################################## */
@@ -172,6 +173,7 @@ 
#define FIX_BASOP_2436_REUSED_CLDFB_IN_OMASA_SR         /* FhG: basop issue 2436 (related to basop 2283): fix garbage output for >1 object OMASA with extrend as ISAR prerenderer */

#define FIX_FLOAT_1528_5MS_REND_ISM_META_DELAY_COMPENSATION  /* Nokia: float issue 1528: Fixes incorrect compensation for ISM metadata delay in 5ms TD rendering */





/* ##################### End NON-BE switches ########################### */



/* ################## End MAINTENANCE switches ######################### */