[FFmpeg-cvslog] avcodec/pixlet: avoid some overflows

Paul B Mahol git at videolan.org
Sat Dec 24 11:41:33 EET 2016


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sat Dec 24 10:26:27 2016 +0100| [ab31b46b89362041a8e37cb0aac67cf3b53c2524] | committer: Paul B Mahol

avcodec/pixlet: avoid some overflows

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab31b46b89362041a8e37cb0aac67cf3b53c2524
---

 libavcodec/pixlet.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/pixlet.c b/libavcodec/pixlet.c
index 1755fb8..e78b666 100644
--- a/libavcodec/pixlet.c
+++ b/libavcodec/pixlet.c
@@ -246,7 +246,7 @@ static int read_high_coeffs(AVCodecContext *avctx, uint8_t *src, int16_t *dst, i
             value = 0;
         } else {
             xflag &= 1u;
-            tmp = c * ((yflag + 1) >> 1) + (c >> 1);
+            tmp = (int64_t)c * ((yflag + 1) >> 1) + (c >> 1);
             value = xflag + (tmp ^ -xflag);
         }
 
@@ -256,7 +256,7 @@ static int read_high_coeffs(AVCodecContext *avctx, uint8_t *src, int16_t *dst, i
             j = 0;
             dst += stride;
         }
-        state += d * yflag - (d * state >> 8);
+        state += (int64_t)d * yflag - (d * state >> 8);
 
         flag = 0;
 



More information about the ffmpeg-cvslog mailing list