ituh263: reject b-frame with pp_time = 0
authorKeiji Costantini <strites@gmail.com>
Sat, 1 Mar 2014 18:17:04 +0000 (18:17 +0000)
committerReinhard Tartler <siretart@tauware.de>
Sun, 2 Mar 2014 16:45:32 +0000 (11:45 -0500)
Avoid a division by 0 in ff_mpeg4_set_one_direct_mv.

Sample-Id: 00000168-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
(cherry picked from commit 9514440337875e0c63b409abcd616b68c518283f)
(cherry picked from commit 5df52b0131d3d4d804ad6e221bc9a2cd8b201ef2)

libavcodec/ituh263dec.c

index cb26be2..3cbc7b8 100644 (file)
@@ -753,6 +753,8 @@ int ff_h263_decode_mb(MpegEncContext *s,
         }
 
         if(IS_DIRECT(mb_type)){
+            if (!s->pp_time)
+                return AVERROR_INVALIDDATA;
             s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT;
             mb_type |= ff_mpeg4_set_direct_mv(s, 0, 0);
         }else{