Commit 3214db98 authored by Reimar Döffinger's avatar Reimar Döffinger

Improve dxa probe by checking the values for width and height are reasonable.

Originally committed as revision 19897 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 892d7e78
...@@ -36,9 +36,15 @@ typedef struct{ ...@@ -36,9 +36,15 @@ typedef struct{
static int dxa_probe(AVProbeData *p) static int dxa_probe(AVProbeData *p)
{ {
int w, h;
if (p->buf_size < 15)
return 0;
w = AV_RB16(p->buf + 11);
h = AV_RB16(p->buf + 13);
/* check file header */ /* check file header */
if (p->buf[0] == 'D' && p->buf[1] == 'E' && if (p->buf[0] == 'D' && p->buf[1] == 'E' &&
p->buf[2] == 'X' && p->buf[3] == 'A') p->buf[2] == 'X' && p->buf[3] == 'A' &&
w && w <= 2048 && h && h <= 2048)
return AVPROBE_SCORE_MAX; return AVPROBE_SCORE_MAX;
else else
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment