MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/img2dec: check w/h in dpx_probe

Browse Source 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-12-21 23:00:36 +01:00
parent b7e506b3b9
commit 41ee459e88
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/img2dec.c
View File

@ -606,8 +606,17 @@ static int bmp_probe(AVProbeData *p)
static int dpx_probe(AVProbeData *p)
{
const uint8_t *b = p->buf;
int w, h;
int is_big = (AV_RN32(b) == AV_RN32("SDPX"));
if (AV_RN32(b) == AV_RN32("SDPX") || AV_RN32(b) == AV_RN32("XPDS"))
if (p->buf_size < 0x304+8)
return 0;
w = is_big ? AV_RB32(p->buf + 0x304) : AV_RL32(p->buf + 0x304);
h = is_big ? AV_RB32(p->buf + 0x308) : AV_RL32(p->buf + 0x308);
if (w <= 0 || h <= 0)
return 0;
if (is_big || AV_RN32(b) == AV_RN32("XPDS"))
return AVPROBE_SCORE_EXTENSION + 1;
return 0;
}