From 44841528c197435be44f0c3598098e6c52f0df26 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 9 Apr 2014 06:56:53 +0200 Subject: [PATCH] avcodec/mpegaudioenc_template: reorder operations to prevent integer overflow Signed-off-by: Michael Niedermayer --- libavcodec/mpegaudioenc_template.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpegaudioenc_template.c b/libavcodec/mpegaudioenc_template.c index 5ae4269c26..451d140444 100644 --- a/libavcodec/mpegaudioenc_template.c +++ b/libavcodec/mpegaudioenc_template.c @@ -700,9 +700,10 @@ static void encode_frame(MpegAudioContext *s, else q1 = sample >> shift; q1 = (q1 * mult) >> P; - q[m] = ((q1 + (1 << P)) * steps) >> (P + 1); - if (q[m] < 0) - q[m] = 0; + q1 += 1 << P; + if (q1 < 0) + q1 = 0; + q[m] = (unsigned)(q1 * steps) >> (P + 1); } #endif if (q[m] >= steps)