diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-06 11:48:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-06 11:57:57 +0100 |
| commit | 50a3c4c5d2634b5d4076a5b7c099729cbd59ac45 (patch) | |
| tree | cc3354d2cd30d39c6df6be21155a3cba0f2317db /libavformat/rsd.c | |
| parent | a35e30b6722212cc9f07abba4e3f2d504bd8833d (diff) | |
| download | ffmpeg-50a3c4c5d2634b5d4076a5b7c099729cbd59ac45.tar.gz | |
avformat/rsd: Check channels and sample_rate fields
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rsd.c')
| -rw-r--r-- | libavformat/rsd.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libavformat/rsd.c b/libavformat/rsd.c index 37e544acb1..7fad3e6bbc 100644 --- a/libavformat/rsd.c +++ b/libavformat/rsd.c @@ -43,10 +43,13 @@ static const uint32_t rsd_unsupported_tags[] = { static int rsd_probe(AVProbeData *p) { - if (!memcmp(p->buf, "RSD", 3) && - p->buf[3] - '0' >= 2 && p->buf[3] - '0' <= 6) - return AVPROBE_SCORE_EXTENSION; - return 0; + if (memcmp(p->buf, "RSD", 3) || p->buf[3] - '0' < 2 || p->buf[3] - '0' > 6) + return 0; + if (AV_RL32(p->buf + 8) > 256 || !AV_RL32(p->buf + 8)) + return 1; + if (AV_RL32(p->buf + 16) > 8*48000 || !AV_RL32(p->buf + 16)) + return 1; + return AVPROBE_SCORE_EXTENSION; } static int rsd_read_header(AVFormatContext *s) |