[FFmpeg-cvslog] avcodec/cavsdec: Check frame_rate_code

Michael Niedermayer git at videolan.org
Thu May 14 18:19:57 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 14 18:00:09 2015 +0200| [c5c06e392b56ad19c560924ef17ab31920ffceb7] | committer: Michael Niedermayer

avcodec/cavsdec: Check frame_rate_code

Fixes CID1239111 part1

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c5c06e392b56ad19c560924ef17ab31920ffceb7
---

 libavcodec/cavsdec.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c
index 834092f..a642dc7 100644
--- a/libavcodec/cavsdec.c
+++ b/libavcodec/cavsdec.c
@@ -1146,6 +1146,12 @@ static int decode_seq_header(AVSContext *h)
     skip_bits(&h->gb, 3); //sample_precision
     h->aspect_ratio = get_bits(&h->gb, 4);
     frame_rate_code = get_bits(&h->gb, 4);
+    if (frame_rate_code == 0 || frame_rate_code > 13) {
+        av_log(h->avctx, AV_LOG_WARNING,
+               "frame_rate_code %d is invalid\n", frame_rate_code);
+        frame_rate_code = 1;
+    }
+
     skip_bits(&h->gb, 18); //bit_rate_lower
     skip_bits1(&h->gb);    //marker_bit
     skip_bits(&h->gb, 12); //bit_rate_upper



More information about the ffmpeg-cvslog mailing list