diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 14:10:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 14:10:09 +0100 |
| commit | aef816f957eec100da42bcbf65e3bfe86df679fa (patch) | |
| tree | 15bdbdde9fa060b95e64be2c628ed17efbb15530 /libavformat | |
| parent | e4e4add0e3ba7d8ca8ed9135288da910270d2ea3 (diff) | |
| parent | ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6 (diff) | |
Merge commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6'
* commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6':
lzo: fix overflow checking in copy_backptr()
flacdec: simplify bounds checking in flac_probe()
atrac3: avoid oversized shifting in decode_bytes()
Conflicts:
libavformat/flacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/flacdec.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index 93f8f9df49..d5aacfd15f 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -278,11 +278,9 @@ fail: static int flac_probe(AVProbeData *p) { - const uint8_t *bufptr = p->buf; - const uint8_t *end = p->buf + p->buf_size; - - if(bufptr > end-4 || memcmp(bufptr, "fLaC", 4)) return 0; - else return AVPROBE_SCORE_MAX/2; + if (p->buf_size < 4 || memcmp(p->buf, "fLaC", 4)) + return 0; + return AVPROBE_SCORE_MAX/2; } AVInputFormat ff_flac_demuxer = { |