Commit 8825cb0f authored by Gregory Pallone's avatar Gregory Pallone
Browse files

Merge branch 'main' into basop-2570-ASAN-global-buffer-overflow-in-ivas_objectRenderer_sources_fx

parents be1e7ba4 2afa4141

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ 
#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* Nokia: reintroduce format switching for g192 bitstreams */

#define FIX_2095_REMOVE_UNUSED_ISAR_TABLES              /* Dolby: remove unused ISAR */

#define FIX_FLOAT_1582_STEREO_DFT_QUANTIZE_ITD          /* FhG: float issue 1582: Remove unncessary statement from stereo_dft_quantize_itd() */

#define FIX_1585_ASAN_FORMAT_SW_ALT                     /* VA: float issue 1585: alternative fix memory leaks with format switching */

#define FIX_1585_ASAN_FORMAT_SW_ALT                     /* VA,FhG: float issues 1585,1593: alternative fix memory leaks with format switching */

#define FIX_2570_BUF_OVFL                               /* Orange: basop issue 2570: global-buffer-overflow in lib_rend/ivas_objectRenderer_sources_fx.c */



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

lib_dec/ivas_init_dec.c

+3 −6
Original line number Diff line number Diff line
@@ -2327,12 +2327,6 @@ ivas_error ivas_init_decoder( 
        set_f( st_ivas->mem_hp20_out[i], 0.0f, L_HP20_MEM );

    }



#ifdef FIX_1585_ASAN_FORMAT_SW_ALT

    for ( ; i < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; i++ )

    {

        st_ivas->mem_hp20_out[i] = NULL;

    }

#endif



    /*-------------------------------------------------------------------*

     * Allocate and initialize rendering handles
@@ -2905,6 +2899,9 @@ void ivas_initialize_handles_dec( 
    for ( i = 0; i < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; i++ )

    {

        st_ivas->p_output_f[i] = NULL;

#ifdef FIX_1585_ASAN_FORMAT_SW_ALT

        st_ivas->mem_hp20_out[i] = NULL;

#endif

    }



    return;

scripts/ivas_conformance/runConformance.py

+6 −3
Original line number Diff line number Diff line
@@ -318,6 +318,9 @@ ReferenceMasaMDFiles = { 


PROGRAM_VERSION = "3.1"



MLD_HEADROOM = 0.1

MASAMD_HEADROOM = 0.004





@dataclass

class TestDescriptor:
@@ -1301,7 +1304,7 @@ class MLDConformance: 
        return False



    def analyseTag(self, tag: str) -> bool:

        corridor_threshold = 0.1

        corridor_threshold = MLD_HEADROOM

        command_fail_count = 0

        be_count = 0

        non_be_count = 0
@@ -2053,7 +2056,7 @@ class MLDConformance: 
                            mldRefWithTags,

                            mdlCutWithTags,

                            tag,

                            threshold=0.1,

                            threshold=MLD_HEADROOM,

                            metricKey="MLD",

                            metricLabel="MLD",

                        )
@@ -2143,7 +2146,7 @@ class MLDConformance: 
                            masaMDRefWithTags,

                            masaMDCutWithTags,

                            tag,

                            threshold=0.0,

                            threshold=MASAMD_HEADROOM,

                            metricKey="MASA",

                            metricLabel="MASA",

                        )