[FFmpeg-cvslog] avformat/movenc: Fix potential signed overflows

Michael Niedermayer git at videolan.org
Mon Jun 1 18:05:11 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 17:54:58 2015 +0200| [627dd7fe7ee68259a76c742ea9fdb0916101d152] | committer: Michael Niedermayer

avformat/movenc: Fix potential signed overflows

Fixes CID1302838

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index cfd53f1..9b2c8da 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -2374,9 +2374,9 @@ static int mov_write_tkhd_tag(AVIOContext *pb, MOVMuxContext *mov,
             if (!track_width_1616 ||
                 track->height != track->enc->height ||
                 track_width_1616 > UINT32_MAX)
-                track_width_1616 = track->enc->width * 0x10000;
+                track_width_1616 = track->enc->width * 0x10000U;
             avio_wb32(pb, track_width_1616);
-            avio_wb32(pb, track->height * 0x10000);
+            avio_wb32(pb, track->height * 0x10000U);
         }
     } else {
         avio_wb32(pb, 0);



More information about the ffmpeg-cvslog mailing list