Commit cd05f6d1 authored by multrus's avatar multrus
Browse files

Merge branch '624-msan-use-of-uninitialized-value-in-planarsba-wb-encoder' into 'main' 

Fix for issue#624 & issue#629

See merge request !857
parents f19d4f12 ba76ff8b

lib_com/ivas_dirac_com.c

+4 −0
Original line number Diff line number Diff line
@@ -385,7 +385,11 @@ void ivas_get_dirac_sba_max_md_bits( 
        *bits_frame_nominal = (int16_t) ( sba_total_brate / FRAMES_PER_SEC );

        *metadata_max_bits = MAX16B; /* no limit */

    }

#ifdef FIX_629_UBSAN_MD_MAX_BITS

    *metadata_max_bits = (int16_t) min( (float) MAX16B, ceilf( (float) *metadata_max_bits * nbands / 5 ) );

#else

    *metadata_max_bits = (int16_t) ceilf( (float) *metadata_max_bits * nbands / 5 );

#endif

    *qmetadata_max_bit_req = QMETADATA_MAXBIT_REQ_SBA >> 1;



    return;

lib_com/options.h

100755 → 100644
+4 −0
Original line number Diff line number Diff line
@@ -195,6 +195,10 @@ 
#define FIX_622_SILENCE_USAN_WARNING                    /* FhG: silenceusan warning in ifft code */



#define FIX_615_UBSAN_SPAR_TO_DIRAC                     /*Dlb : Fix for UBSAN issue 615*/



#define FIX_624_PLANAR_SBA_WB                           /*Dlb : Fix for unintialised value issue 624 */

#define FIX_629_UBSAN_MD_MAX_BITS                       /*Dlb : Fix for UBSAN issue 629 for MD MAX bits calculation*/



#define FIX_626_VARIABLE_TYPE_MDCT_CONC                 /* FhG: trivial fix to fix USAN error */

#define FIX_616_DIV_ZERO_MCT                            /*FhG : Fix UBSAN division by zero error of issue 616*/

#define FIX_279_CODE_COVERAGE                           /*Dlb : issue 279 , clean up unused function*/

lib_enc/ivas_spar_encoder.c

+7 −0
Original line number Diff line number Diff line
@@ -433,6 +433,13 @@ static ivas_error ivas_spar_cov_md_process( 
        {

            cov_real[i][j] = cov_real_buf[i][j];

            cov_dtx_real[i][j] = cov_dtx_real_buf[i][j];

#ifdef FIX_624_PLANAR_SBA_WB

            for ( b = hSpar->hFbMixer->pFb->filterbank_num_bands; b < IVAS_MAX_NUM_BANDS; b++ )

            {

                cov_real[i][j][b] = 0.0f;

                cov_dtx_real[i][j][b] = 0.0f;

            }

#endif

        }

    }