Commit 55434d55 authored by multrus's avatar multrus
Browse files

Merge branch... 

Merge branch 'basop-2458-usan-applying-zero-offset-to-null-pointer-in-lib_rend-ivas_objectrenderer_fx-c-426-9' into 'main'

Resolve "USAN: applying zero offset to null pointer in lib_rend/ivas_objectRenderer_fx.c:426:9"

Closes #2458

See merge request !2849
parents 382b377d cd51c4fb

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ 
#define FIX_MDCT_STEREO_ENC_STACK                       /* VA: basop issue 2428: Move IGF temporary buffers out of the highest stack */

#define HARMONIZE_TBE3                                  /* VA: basop issue 2399: Remove duplicated code: TBE, step 3 */

#define FIX_2459_USAN_AMR_SIDSTART                      /* FhG: basop issue 2459: fix msan complaint */

#define FIX_2458_USAN_NULLPTR_WITH_ZERO_OFFSET          /* FhG: basop issue 2458: avoid indexing into null pointer */



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

lib_rend/ivas_objectRenderer_fx.c

+5 −0
Original line number Diff line number Diff line
@@ -421,9 +421,14 @@ ivas_error ivas_td_binaural_renderer_unwrap_fx( 
            tmp_headRotEnabled = enableCombinedOrientation[hCombinedOrientationData->subframe_idx];

            move16();

            tmp_CombinedOrient_subframe_idx = hCombinedOrientationData->subframe_idx;

            move16();

        }



#ifdef FIX_2458_USAN_NULLPTR_WITH_ZERO_OFFSET

        IF( NE_32( ( error = TDREND_Update_listener_orientation_fx( hBinRendererTd, tmp_headRotEnabled, ( Quaternions != NULL ) ? &Quaternions[tmp_CombinedOrient_subframe_idx] : NULL, ( Pos != NULL ) ? &Pos[tmp_CombinedOrient_subframe_idx] : NULL ) ), IVAS_ERR_OK ) )

#else

        IF( NE_32( ( error = TDREND_Update_listener_orientation_fx( hBinRendererTd, tmp_headRotEnabled, &Quaternions[tmp_CombinedOrient_subframe_idx], &Pos[tmp_CombinedOrient_subframe_idx] ) ), IVAS_ERR_OK ) )

#endif

        {

            return error;

        }