From f9b89b61f819535b4dbe6c3e9f0d6fc8becf64cb Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 11 Nov 2013 19:53:22 +0100 Subject: [PATCH] avformat/electronicarts: check chunksize more completely in probe() Fixes probetest failure Signed-off-by: Michael Niedermayer --- libavformat/electronicarts.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c index 3694a02176..dd8cf5d644 100644 --- a/libavformat/electronicarts.c +++ b/libavformat/electronicarts.c @@ -440,6 +440,8 @@ static int process_ea_header(AVFormatContext *s) static int ea_probe(AVProbeData *p) { + unsigned big_endian, size; + switch (AV_RL32(&p->buf[0])) { case ISNh_TAG: case SCHl_TAG: @@ -454,7 +456,11 @@ static int ea_probe(AVProbeData *p) default: return 0; } - if (AV_RL32(&p->buf[4]) > 0xfffff && AV_RB32(&p->buf[4]) > 0xfffff) + size = AV_RL32(&p->buf[4]); + big_endian = size > 0x000FFFFF; + if (big_endian) + size = av_bswap32(size); + if (size > 0xfffff || size < 8) return 0; return AVPROBE_SCORE_MAX;