1. ffmpeg
  2. Commit e0ef1b8c0b21122850458d1c2c229d8bd852a74d
Browse code

nutdec: check for negative frame rate in decode_info_header

A negative frame rate triggers an av_assert2 in av_rescale_rnd.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6621105877ce0d65724a8ab60b3a50160adbe65d)

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

Andreas Cadhalpun authored on 2015/04/29 03:31:56
Showing 1 changed files
libavformat/nutdec.c
History View file @ e0ef1b8
... ... 
@@ -575,7 +575,8 @@ static int decode_info_header(NUTContext *nut)
575 575
576 576 
             if (stream_id_plus1 && !strcmp(name, "r_frame_rate")) {
577 577 
                 sscanf(str_value, "%d/%d", &st->r_frame_rate.num, &st->r_frame_rate.den);
578 
-                if (st->r_frame_rate.num >= 1000LL*st->r_frame_rate.den)
578 
+                if (st->r_frame_rate.num >= 1000LL*st->r_frame_rate.den ||
579 
+                    st->r_frame_rate.num < 0 || st->r_frame_rate.num < 0)
579 580 
                     st->r_frame_rate.num = st->r_frame_rate.den = 0;
580 581 
                 continue;
581 582 
             }