diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-30 23:59:40 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-17 03:50:41 +0100 |
commit | a23a3dba25448939e6be43c9196f1e6917258e2e (patch) | |
tree | 57de59e0558407b553a025a4798e2763ee0299bf /libavcodec | |
parent | 0360dbefad8aa6c61e7544d7028a5a599eddbbc4 (diff) | |
download | ffmpeg-a23a3dba25448939e6be43c9196f1e6917258e2e.tar.gz |
qdm2: check array index before use, fix out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a7ee6281f7ef1c29284e3a4cadfe0f227ffde1ed)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/qdm2.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index e2f1a87033..ba68d02103 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -1262,6 +1262,11 @@ static void qdm2_decode_super_block (QDM2Context *q) for (i = 0; packet_bytes > 0; i++) { int j; + if (i>=FF_ARRAY_ELEMS(q->sub_packet_list_A)) { + SAMPLES_NEEDED_2("too many packet bytes"); + return; + } + q->sub_packet_list_A[i].next = NULL; if (i > 0) { |