summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-11-28 10:54:35 +0100
committerAnton Khirnov <anton@khirnov.net>2014-01-03 16:38:36 +0100
commit5569146d48f06564e8fa393424782cceed510916 (patch)
treedf0c705cf95c83826a5410f82a43e56e78a0a360
parenta6a2282c25abe43e352010a7c3fbc92994c0bc1c (diff)
downloadffmpeg-streaming-5569146d48f06564e8fa393424782cceed510916.zip
ffmpeg-streaming-5569146d48f06564e8fa393424782cceed510916.tar.gz
adx: check that the offset is not negative
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
-rw-r--r--libavcodec/adx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/adx.c b/libavcodec/adx.c
index 6335865..a9cf4ff 100644
--- a/libavcodec/adx.c
+++ b/libavcodec/adx.c
@@ -48,7 +48,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 */
OpenPOWER on IntegriCloud