Module: libav
Branch: release/9
Commit: 9d4355d90a6a8fc49f6ff05f98b86e37c262ac91
Author: Xi Wang <xi.w...@gmail.com>
Committer: Luca Barbato <lu_z...@gentoo.org>
Date: Fri Mar 15 07:11:47 2013 -0400
flacdec: simplify bounds checking in flac_probe()
Simplify `p->buf > p->buf + p->buf_size - 4' as `p->buf_size < 4'.
Avoid a possible out-of-bounds pointer, which is undefined behavior
in C.
CC: libav-sta...@libav.org
Signed-off-by: Xi Wang <xi.w...@gmail.com>
Signed-off-by: Luca Barbato <lu_z...@gentoo.org>
(cherry picked from commit 8425d693eefbedbb41f91735614d41067695aa37)
---
libavformat/flacdec.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c
index f19f95d..fcacf19 100644
--- a/libavformat/flacdec.c
+++ b/libavformat/flacdec.c
@@ -278,11 +278,9 @@ static int flac_read_header(AVFormatContext *s)
static int flac_probe(AVProbeData *p)
{
- uint8_t *bufptr = p->buf;
- 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 = {
_______________________________________________
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
