Commit d932ab29 authored by vaclav's avatar vaclav
Browse files

Merge branch 'basop-2290-clang-18-copy-of-uninitialized-data' into 'main' 

basop-2290-clang-18-copy-of-uninitialized-data

See merge request !2667
parents ca6e9ba7 1d2cfd7d

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ 
#define FIX_1872_REMOVE_UNUSED_PSNOISEGEN_ISAR              /* Dolby: Remove unused psNoiseGen from ISAR */

#define FIX_1478_UNINIT_ON_BFI                          /* VA: Fix issue 1478 where a vector is partly un-initialized during bfi */

#define FIX_1487_ACCESS_OF_UNINIT_VAL_FROM_ARR_ISM_DTX  /* FhG/VA: init nb_bits_metadata to zero */

#define FIX_2290_COPY_OF_UNINIT_DATA                    /* VA: prevent the copy of un-initialized data */

#define CLEANUP_ACELP_ENC                               /* VA: basop issue 2304: Remove duplicated code in excitation encoding in the ACELP core */



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

lib_dec/ivas_core_dec_fx.c

+7 −1
Original line number Diff line number Diff line
@@ -562,8 +562,14 @@ ivas_error ivas_core_dec_fx( 
                hSCE->q_save_hb_synth_fx = Q11;

                move16();

            }



#ifdef FIX_2290_COPY_OF_UNINIT_DATA

            IF( st->hBWE_FD != NULL )

            {

                Copy_Scale_sig_16_32_DEPREC( old_syn_12k8_16k_fx_16, old_syn_12k8_16k_fx[n], st->L_frame, Q11 - ( -Q1 ) ); // Q(11 - (-1))

            }

#else

            Copy_Scale_sig_16_32_DEPREC( old_syn_12k8_16k_fx_16, old_syn_12k8_16k_fx[n], L_FRAME16k, Q11 - ( -Q1 ) ); // Q(11 - (-1))

#endif

        }



        Copy_Scale_sig_32_16( st->previoussynth_fx_32, st->previoussynth_fx, L_FRAME48k, 0 ); // Q0

lib_dec/ivas_jbm_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ ivas_error ivas_dec_fx( 
                FOR( i = 0; i < 2; i++ )

                {

#ifdef FIX_2297_SBA_SCALING_32KHZ

                    s = s_min( s, L_norm_arr( p_output_fx[i], output_frame ) - 11 ) /* Guard bits */; // L_frame should be used instead of L_FRAME48k */

                    s = s_min( s, L_norm_arr( p_output_fx[i], output_frame ) - 11 ) /* Guard bits */;

#else

                    s = s_min( s, L_norm_arr( p_output_fx[i], L_FRAME48k ) - 11 ) /* Guard bits */; // L_frame should be used instead of L_FRAME48k */

#endif