diff options
author | Anton Khirnov <anton@khirnov.net> | 2013-11-28 10:54:35 +0100 |
---|---|---|
committer | Reinhard Tartler <siretart@tauware.de> | 2014-05-31 20:05:19 -0400 |
commit | d0ecfe32492bbf27274bbb0c525d2ea59518cd5f (patch) | |
tree | fa2155fe585da5257d77f6f020092b69f956a220 | |
parent | 07558d0b9fa0923e8b53f6eb7f2b69c4d631f11a (diff) | |
download | ffmpeg-d0ecfe32492bbf27274bbb0c525d2ea59518cd5f.tar.gz |
adx: check that the offset is not negative
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
(cherry picked from commit 5569146d48f06564e8fa393424782cceed510916)
-rw-r--r-- | libavcodec/adx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/adx.c b/libavcodec/adx.c index 1e5d89c991..41e8e1c8c1 100644 --- a/libavcodec/adx.c +++ b/libavcodec/adx.c @@ -47,7 +47,7 @@ int avpriv_adx_decode_header(AVCodecContext *avctx, const uint8_t *buf, offset = AV_RB16(buf + 2) + 4; /* if copyright string is within the provided data, validate it */ - if (bufsize >= offset && memcmp(buf + offset - 6, "(c)CRI", 6)) + if (bufsize >= offset && offset >= 6 && memcmp(buf + offset - 6, "(c)CRI", 6)) return AVERROR_INVALIDDATA; /* check for encoding=3 block_size=18, sample_size=4 */ |