Commit f167a62f authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '861-div_l-crash-stereo-decoder-tdbwe' into 'main' 

potential fix for crash in div_l

Closes #861

See merge request !565
parents b3500307 2135c3f0

lib_com/mslvq_com_fx.c

+11 −2
Original line number Diff line number Diff line
@@ -904,8 +904,17 @@ static void decode_comb_fx( 
)

{

    Word16 idx_sign;



#ifdef FIX_961_CRASH_DIV_L

    IF( LT_32( L_shl( index, 1 ), pi0[idx_lead] ) )

    {

        idx_sign = 0;

        move16();

    }

    ELSE

#endif

    {

        idx_sign = extract_l( div_l( L_shl( index, 1 ), pi0[idx_lead] ) ); /*(index/pi0_fx[idx_lead]); */

    }

    index = L_sub( index, L_mult0( idx_sign, pi0[idx_lead] ) );

    decode_leaders_fx( extract_l( index ), idx_lead, cv );

    decode_sign_pc1_fx( cv, idx_sign, pl_par[idx_lead] );

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ 
#define FIX_835_PARAMMC_BUFFER_VALUES                   /* FhG: issue 835: wide range of buffer values for cx in ParamMC */



#define FIX_860_FER_CRASH                       /* VA: fix crash issues caused by saturation within shl */



#define FIX_961_CRASH_DIV_L                     /* VA: fix to potential crash in div_l when index is <= 0 */

/* ################## End DEVELOPMENT switches ######################### */



/* clang-format on */