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

Merge branch '1383-sanitizer-issue-when-accessing-headrotdata-in-ivas-rend' into 'main' 

Resolve "Sanitizer issue when accessing headRotData in IVAS rend"

See merge request !2244
parents 419f7985 3481b6fc

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -169,6 +169,8 @@ 
#define FIX_1384_MSAN_ivas_spar_dec_open                /* VA: issue 1386: fix use-of-uninitialized value in ivas_spar_dec_open() */

#define FIX_1384_MSAN_stereo_tcx_core_enc               /* VA: issue 1384: fix use-of-uninitialized value in stereo_tcx_core_enc() */

#define FIX_1388_MSAN_ivas_init_decoder                 /* VA: issue 1388: fix use-of-uninitialized value in ivas_init_decoder() */

#define FIX_1383_HEAD_TRACK_SANITIZER                   /* Nok: issue 1383: Fix head tracking struc values reading in renderer */





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

lib_rend/ivas_rotation.c

+7 −0
Original line number Diff line number Diff line
@@ -898,6 +898,12 @@ ivas_error combine_external_and_head_orientations_rend( 
    int16_t i;



    sr_pose_pred_axis = DEFAULT_AXIS;

#ifdef FIX_1383_HEAD_TRACK_SANITIZER

    if ( hHeadTrackData->headRotEnabled )

    {

        headRotQuaternions = hHeadTrackData->headPositions;

        listenerPos = hHeadTrackData->Pos;

#else

    if ( hHeadTrackData != NULL )

    {

        if ( hHeadTrackData->headRotEnabled )
@@ -905,6 +911,7 @@ ivas_error combine_external_and_head_orientations_rend( 
            headRotQuaternions = hHeadTrackData->headPositions;

            listenerPos = hHeadTrackData->Pos;

        }

#endif

        sr_pose_pred_axis = hHeadTrackData->sr_pose_pred_axis;

    }

    else if ( hExtOrientationData != NULL )