[FFmpeg-devel] [PATCH 3/3] aacps: avoid division by zero in stereo_processing

[Rostislav Pehlivanov]

Thanks, applied.

border_position[] refers to the sample location for each PS envelope
parameter specified as a QMF sample index. So, overlapping here
wouldn't make sense.

Also, thanks for your efforts in packaging FFmpeg for Debian, speaking
as a fellow user.

On Sun, 2015-11-08 at 22:04 +0100, Andreas Cadhalpun wrote:
> This fixes a SIGFPE crash in the aac_fixed decoder.
> 
> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
> ---
>  libavcodec/aacps.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/aacps.c b/libavcodec/aacps.c
> index 1165d9b..ccc79ff 100644
> --- a/libavcodec/aacps.c
> +++ b/libavcodec/aacps.c
> @@ -940,7 +940,7 @@ static void stereo_processing(PSContext *ps,
> INTFLOAT (*l)[32][2], INTFLOAT (*r)
>              LOCAL_ALIGNED_16(INTFLOAT, h_step, [2], [4]);
>              int start = ps->border_position[e];
>              int stop  = ps->border_position[e+1];
> -            INTFLOAT width = Q30(1.f) / (stop - start);
> +            INTFLOAT width = Q30(1.f) / ((stop - start) ? (stop -
> start) : 1);
>  #if USE_FIXED
>              width <<= 1;
>  #endif