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
This commit is contained in:
Reimar Döffinger 2009-09-14 15:44:05 +00:00
parent 03354862cb
commit 8466ab59b2
1 changed files with 5 additions and 0 deletions

View File

@ -105,6 +105,11 @@ static int idcin_probe(AVProbeData *p)
* audio channels: 0 for no audio, or 1 or 2 * 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 */ /* check the video width */
number = AV_RL32(&p->buf[0]); number = AV_RL32(&p->buf[0]);
if ((number == 0) || (number > 1024)) if ((number == 0) || (number > 1024))