[SCM] libav/wheezy-security: ituh263: reject b-frame with pp_time = 0
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 1 21:36:11 UTC 2014
The following commit has been merged in the wheezy-security branch:
commit 16f0f97eec7945d082b74ed88de382bac21538ca
Author: Keiji Costantini <strites at gmail.com>
Date: Sat Mar 1 18:17:04 2014 +0000
ituh263: reject b-frame with pp_time = 0
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 at gmail.com>
(cherry picked from commit 9514440337875e0c63b409abcd616b68c518283f)
(cherry picked from commit 5df52b0131d3d4d804ad6e221bc9a2cd8b201ef2)
(cherry picked from commit aa2a3ca27a3269e2b975686652204607fad8bc49)
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
index 028d2a1..ebbead4 100644
--- a/libavcodec/ituh263dec.c
+++ b/libavcodec/ituh263dec.c
@@ -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{
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list