[FFmpeg-cvslog] astdec: fix division by zero

Andreas Cadhalpun git at videolan.org
Mon Oct 17 21:46:44 EEST 2016


ffmpeg | branch: master | Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com> | Sun Oct 16 22:39:47 2016 +0200| [9959a52b14bcfa3e5baeb3fc8a86c04bbc0d3d5d] | committer: Andreas Cadhalpun

astdec: fix division by zero

Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>

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

 libavformat/astdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/astdec.c b/libavformat/astdec.c
index f3ca721..7a53d0b 100644
--- a/libavformat/astdec.c
+++ b/libavformat/astdec.c
@@ -90,7 +90,7 @@ static int ast_read_packet(AVFormatContext *s, AVPacket *pkt)
     pos  = avio_tell(s->pb);
     type = avio_rl32(s->pb);
     size = avio_rb32(s->pb);
-    if (size > INT_MAX / s->streams[0]->codecpar->channels)
+    if (!s->streams[0]->codecpar->channels || size > INT_MAX / s->streams[0]->codecpar->channels)
         return AVERROR_INVALIDDATA;
 
     size *= s->streams[0]->codecpar->channels;



More information about the ffmpeg-cvslog mailing list