diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-30 23:59:40 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2013-02-17 11:31:20 +0100 |
| commit | 39bec05ed42e505d17877b0c23f16322f9b5883b (patch) | |
| tree | fa8e56432f76983362ca93544f93eea9dc7122f2 /libavcodec/qdm2.c | |
| parent | 1f8f43a5b5e9b966d364d1d2d6ed741f07dcceaa (diff) | |
| download | ffmpeg-39bec05ed42e505d17877b0c23f16322f9b5883b.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)
CC: libav-stable@libav.org
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Diffstat (limited to 'libavcodec/qdm2.c')
| -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 1286cc5163..61ac0a830d 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -1232,6 +1232,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) { |