mtv: improve header check and avoid division by zero

CC: libav-stable@libav.org Bug-Id: CID 732203 / CID 732204
10 years ago · f64d7e919e
parent b3d11437ca
commit f64d7e919e
1 changed files with 5 additions and 2 deletions
--- a/libavformat/mtv.c
+++ b/libavformat/mtv.c
@ -96,14 +96,17 @@ static int mtv_read_header(AVFormatContext *s)

    /* Calculate width and height if missing from header */

-    if(!mtv->img_width)
+    if (!mtv->img_width && mtv->img_height > 0 && mtv->img_bpp >= 8)
        mtv->img_width=mtv->img_segment_size / (mtv->img_bpp>>3)
                        / mtv->img_height;

-    if(!mtv->img_height)
+    if (!mtv->img_height && mtv->img_width > 0 && mtv->img_bpp >= 8)
        mtv->img_height=mtv->img_segment_size / (mtv->img_bpp>>3)
                        / mtv->img_width;

+    if (!mtv->img_width || !mtv->img_height)
+        return AVERROR_INVALIDDATA;
+
    avio_skip(pb, 4);
    audio_subsegments = avio_rl16(pb);