RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-02 21:01:56 +00:00
Code Issues Projects Releases Wiki Activity

yop_probe: check more fields to avoid detecting random data as yop

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-05-31 14:47:15 +02:00
parent 60de761657
commit 76170f5373
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/yop.c
View File

@ -38,10 +38,15 @@ typedef struct yop_dec_context {
static int yop_probe(AVProbeData *probe_packet) static int yop_probe(AVProbeData *probe_packet)
{ {
if (AV_RB16(probe_packet->buf) == AV_RB16("YO") && if (AV_RB16(probe_packet->buf) == AV_RB16("YO") &&
probe_packet->buf[2]<10 &&
probe_packet->buf[3]<10 &&
probe_packet->buf[6] && probe_packet->buf[6] &&
probe_packet->buf[7] && probe_packet->buf[7] &&
!(probe_packet->buf[8] & 1) && !(probe_packet->buf[8] & 1) &&
!(probe_packet->buf[10] & 1)) !(probe_packet->buf[10] & 1) &&
AV_RL16(probe_packet->buf + 12 + 6) >= 920 &&
AV_RL16(probe_packet->buf + 12 + 6) < probe_packet->buf[12] * 3 + 4 + probe_packet->buf[7] * 2048
)
return AVPROBE_SCORE_MAX * 3 / 4; return AVPROBE_SCORE_MAX * 3 / 4;
return 0; return 0;