Commit cd37dc94 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch... 

Merge branch 'basop-2328-clang18-msan-use-of-uninitialized-value-in-lib_rend-lib_rend_fx-c-11202-19' into 'main'

Resolve "[CLANG18] MSAN: use-of-uninitialized-value in lib_rend/lib_rend_fx.c:11202:19"

Closes #2328

See merge request !2725
parents fbcb3376 35f019fe

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ 
#define FIX_BASOP_2324_MISSING_SET_TO_ZERO              /* Nokia: basop issue 2324: Fix issue by setting the exponent to zero where it should be */

#define FIX_BASOP_2326_WRONG_SIG_LENGTH                 /* Nokia: basop issue 2326: Fix issue by using correct signal length in multiple places */

#define FIX_BASOP_2327_WRONG_LOOP_END                   /* Nokia: basop inssue 2327: Correct loop end to solve MSAN error */

#define FIX_BASOP_2328_MSAN_WRONG_ASSIGNMENT            /* Nokia: basop issue 2328: Fix MSAN error by correcting the variable assignment */



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

lib_rend/ivas_dirac_output_synthesis_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -211,7 +211,11 @@ ivas_error ivas_dirac_dec_output_synthesis_open_fx( 
        {

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

        }

#ifdef FIX_BASOP_2328_MSAN_WRONG_ASSIGNMENT

        dirac_output_synthesis_state->cy_auto_diff_smooth_prev_len = imult1616( dirac_output_synthesis_params->max_band_decorr, hDirACRend->num_outputs_diff );

#else

        dirac_output_synthesis_state->cy_auto_dir_smooth_prev_len = imult1616( dirac_output_synthesis_params->max_band_decorr, hDirACRend->num_outputs_diff );

#endif

        move16();

    }

    ELSE