Commit 049a3cd0 authored by Jonas Svedberg's avatar Jonas Svedberg
Browse files

added fix for #621, UBSAN complaint of offset addition to NULL ptr

parent 53fecda5

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ 
#define FIX_581_CLANG_OFFSET_TO_NULL                    /* FhG: issue 581: fix CLANG error about applying an offset to a NULL pointer */

#define JBM_PARAMUPMIX                                  /* Dlb: Issue 471: Integrate the Multichannel Parametric Upmix into the JBM path */

#define FIX_612_MSVQ_UBSAN_LEFTSHIFT                    /* Eri: Issue 612 :  UBSAN: left shift of negative values in 1st stage of MSVQ  */



#define FIX_621_MSVQ_UBSAN_NULL_PTR_OFFSET              /* Eri: Issue 621 :  UBSAN:  applying non-zero offset 7200 to null pointer in lsf_msvq_ma_enc.c  */



/* Fixes for bugs found during split rendering contribution development */

#define REND_STATIC_MEM_OPT                             /* Dlb: Static memory optimisation for external renderer */

lib_enc/lsf_msvq_ma_enc.c

+7 −0
Original line number Diff line number Diff line
@@ -559,7 +559,14 @@ void msvq_enc( 
        {

            /* Subtract codebook entry from residual vector of parent node  */

            p1 = resid[0] + parents[c] * N;

#ifdef  FIX_621_MSVQ_UBSAN_NULL_PTR_OFFSET

            if (cb_stage != NULL )

            {

                p2 = cb_stage + ( indices[1][c * stages + s] ) * maxn; /* regular ptr init */

            }

#else 

            p2 = cb_stage + ( indices[1][c * stages + s] ) * maxn; /* regular ptr init */

#endif 

            if ( s == 0 && applyDCT_flag != 0 )

            {

                p2 = (const float *) &( st1_syn_vec_ptr[c * FDCNG_VQ_MAX_LEN] ); /*ptr init of stage 1 */