Unverified Commit 16f978e8 authored by janssontoftg's avatar janssontoftg
Browse files

Add 2 bytes for header in maxDataBytes comparison

parent 86f9ea10

lib_util/ivas_rtp_pi_data.c

+9 −9
Original line number Diff line number Diff line
@@ -791,8 +791,8 @@ static ivas_error packISMNum( const IVAS_PIDATA_GENERIC *piData, uint8_t *buffer 
        return IVAS_ERROR( IVAS_ERR_WRONG_PARAMS, "Incorrect PI ID in ISM_NUM PI data" );

    }



    /* ISM_NUM data is 1 bytes */

    if ( maxDataBytes < 1 )

    /* ISM_NUM data is 1 bytes, header is 2 bytes */

    if ( maxDataBytes < 1 + 2 )

    {

        return IVAS_ERROR( IVAS_ERR_RTP_INSUFFICIENT_OUTPUT_SIZE, "Insufficient space to pack ISM_NUM PI data" );

    }
@@ -840,8 +840,8 @@ static ivas_error packISMID( const IVAS_PIDATA_GENERIC *piData, uint8_t *buffer, 
        return IVAS_ERROR( IVAS_ERR_WRONG_PARAMS, "Incorrect PI ID in ISM_ID PI data" );

    }



    /* ISM_ID data is 1 byte per object */

    if ( maxDataBytes < 1 * IVAS_MAX_NUM_OBJECTS )

    /* ISM_ID data is 1 byte per object, header is 2 bytes */

    if ( maxDataBytes < 1 * IVAS_MAX_NUM_OBJECTS + 2 )

    {

        return IVAS_ERROR( IVAS_ERR_RTP_INSUFFICIENT_OUTPUT_SIZE, "Insufficient space to pack ISM_NUM PI data" );

    }
@@ -903,8 +903,8 @@ static ivas_error packISMGain( const IVAS_PIDATA_GENERIC *piData, uint8_t *buffe 
        return IVAS_ERROR( IVAS_ERR_WRONG_PARAMS, "Incorrect PI ID in ISM_GAIN PI data" );

    }



    /* ISM_GAIN data is 1 byte per object */

    if ( maxDataBytes < 1 * IVAS_MAX_NUM_OBJECTS )

    /* ISM_GAIN data is 1 byte per object, header is 2 bytes */

    if ( maxDataBytes < 1 * IVAS_MAX_NUM_OBJECTS + 2 )

    {

        return IVAS_ERROR( IVAS_ERR_RTP_INSUFFICIENT_OUTPUT_SIZE, "Insufficient space to pack ISM_GAIN PI data" );

    }
@@ -991,8 +991,8 @@ static ivas_error packISMDistanceAttenuation( const IVAS_PIDATA_GENERIC *piData, 
        return IVAS_ERROR( IVAS_ERR_WRONG_PARAMS, "Incorrect PI ID in ISM_DISTANCE_ATTENUATION PI data" );

    }



    /* ISM_DISTANCE_ATTENUATION data is 3 bytes per object */

    if ( maxDataBytes > 3 * IVAS_MAX_NUM_OBJECTS )

    /* ISM_DISTANCE_ATTENUATION data is 3 bytes per object, header is 2 bytes */

    if ( maxDataBytes > 3 * IVAS_MAX_NUM_OBJECTS + 2 )

    {

        return IVAS_ERROR( IVAS_ERR_RTP_INSUFFICIENT_OUTPUT_SIZE, "Insufficient space to pack ISM_DISTANCE_ATTENUATION PI data" );

    }
@@ -1071,7 +1071,7 @@ static ivas_error packISMDirectivity( const IVAS_PIDATA_GENERIC *piData, uint8_t 
    }



    /* ISM_DIRECTIVITY data is 2 bytes per object, header is 2 bytes */

    if ( maxDataBytes > 2 * IVAS_MAX_NUM_OBJECTS )

    if ( maxDataBytes > 2 * IVAS_MAX_NUM_OBJECTS + 2 )

    {

        return IVAS_ERROR( IVAS_ERR_RTP_INSUFFICIENT_OUTPUT_SIZE, "Insufficient space to pack ISM_DIRECTIVITY PI data" );

    }