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 a7ee6281f7)

CC: libav-stable@libav.org

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
pull/8/merge
Michael Niedermayer 12 years ago committed by Reinhard Tartler
parent 1f8f43a5b5
commit 39bec05ed4
  1. 5
      libavcodec/qdm2.c

@ -1232,6 +1232,11 @@ static void qdm2_decode_super_block (QDM2Context *q)
for (i = 0; packet_bytes > 0; i++) { for (i = 0; packet_bytes > 0; i++) {
int j; 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; q->sub_packet_list_A[i].next = NULL;
if (i > 0) { if (i > 0) {

Loading…
Cancel
Save