Commit 34f804bc authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 502-masa-hits-assert-in-check_ind_list_limits-at-bitrates-160k-256k
parents 7d6579d0 ede969d0

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ 




#define FIX_485_STATIC_BUFFERS                          /* FhG: move static buffers in DirAC parameter estimator to the DirAC struct */

#define FIX_I503_ASAN_ERROR_IND_LIST                    /* VA: fix issue #503: address sanitizer error with IND_LIST_DYN */



#define FIX_502_IND_LIST_SIZE                           /* Fix issue #502: insufficient index buffer sizes */

lib_enc/ivas_qmetadata_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -2222,7 +2222,11 @@ void restore_metadata_buffer( 
    int16_t i;



#ifdef IND_LIST_DYN

#ifdef FIX_I503_ASAN_ERROR_IND_LIST

    for ( i = next_ind_start; i < hMetaData->nb_ind_tot; i++ )

#else

    for ( i = next_ind_start; i <= hMetaData->nb_ind_tot; i++ )

#endif

#else

    for ( i = next_ind_start; i <= hMetaData->next_ind; i++ )

#endif