[SCM] libav/experimental: Check num_units_in_tick/time_scale to be valid and within the range we support. based on a patch by chrome
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:51:42 UTC 2013
The following commit has been merged in the experimental branch:
commit 7bf3d0c44e06860d2ae26dc7b7764d64beabb727
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Wed Sep 23 09:58:44 2009 +0000
Check num_units_in_tick/time_scale to be valid and within the range we support.
based on a patch by chrome
Originally committed as revision 19979 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 20ad778..31bd4a6 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -7087,6 +7087,10 @@ static inline int decode_vui_parameters(H264Context *h, SPS *sps){
if(sps->timing_info_present_flag){
sps->num_units_in_tick = get_bits_long(&s->gb, 32);
sps->time_scale = get_bits_long(&s->gb, 32);
+ if(sps->num_units_in_tick-1 > 0x7FFFFFFEU || sps->time_scale-1 > 0x7FFFFFFEU){
+ av_log(h->s.avctx, AV_LOG_ERROR, "time_scale/num_units_in_tick inavlid or unsupported (%d/%d)\n", sps->time_scale, sps->num_units_in_tick);
+ return -1;
+ }
sps->fixed_frame_rate_flag = get_bits1(&s->gb);
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list