From 8466ab59b21257ff254b4c17ef428458bac645d9 Mon Sep 17 00:00:00 2001 From: Reimar Döffinger Date: Mon, 14 Sep 2009 15:44:05 +0000 Subject: Check buffer size for idcin check, otherwise false positives are too likely for small probe buffer sizes due to 0-padding (see probetest results). Originally committed as revision 19838 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/idcin.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libavformat/idcin.c') diff --git a/libavformat/idcin.c b/libavformat/idcin.c index 0a5f825df6..8e9dfb57c3 100644 --- a/libavformat/idcin.c +++ b/libavformat/idcin.c @@ -105,6 +105,11 @@ static int idcin_probe(AVProbeData *p) * audio channels: 0 for no audio, or 1 or 2 */ + /* check we have enough data to do all checks, otherwise the + 0-padding may cause a wrong recognition */ + if (p->buf_size < 20) + return 0; + /* check the video width */ number = AV_RL32(&p->buf[0]); if ((number == 0) || (number > 1024)) -- cgit v1.2.3