Commit 578c7b2c authored by Juha Riihim?ki's avatar Juha Riihim?ki Committed by malc
Browse files

audio: fix integer overflow expression 



Fix an integer overflow that can happen for signed 32 bit types
when using FLOAT_MIXENG. (Note that at the moment this is only true
when using the MacOSX coreaudio audio driver.)

Signed-off-by: default avatarJuha Riihim?ki <juha.riihimaki@nokia.com>
[Peter Maydell: Removed unnecessary casts]
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarmalc <av1474@comtv.ru>
parent b1d7d2b9

audio/mixeng_template.h

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static mixeng_real inline glue (conv_, ET) (IN_T v) 
#endif

#else  /* !RECIPROCAL */

#ifdef SIGNED

    return nv / (mixeng_real) (IN_MAX - IN_MIN);

    return nv / (mixeng_real) ((mixeng_real) IN_MAX - IN_MIN);

#else

    return (nv - HALF) / (mixeng_real) IN_MAX;

#endif
@@ -63,7 +63,7 @@ static IN_T inline glue (clip_, ET) (mixeng_real v) 
    }



#ifdef SIGNED

    return ENDIAN_CONVERT ((IN_T) (v * (IN_MAX - IN_MIN)));

    return ENDIAN_CONVERT ((IN_T) (v * ((mixeng_real) IN_MAX - IN_MIN)));

#else

    return ENDIAN_CONVERT ((IN_T) ((v * IN_MAX) + HALF));

#endif