commit e34369e8ece08b7bd820366dea5965f4c40c0080
author Michael Niedermayer <michaelni@gmx.at> Fri Nov 30 23:59:40 2012 +0100
committer Michael Niedermayer <michaelni@gmx.at> Mon Dec 03 21:03:14 2012 +0100
tree a8020352386813d40dec3bf06cc3f89bdf6bc4d9
parent 74241de7ed501a34e7dfe291eed3339ca7b50755

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)

libavcodec/qdm2.c

diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index 3a77e7f..7f565dd 100644
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -1259,6 +1259,11 @@
     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) {