From a7ee6281f7ef1c29284e3a4cadfe0f227ffde1ed Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 30 Nov 2012 23:59:40 +0100
Subject: [PATCH] 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>
---
libavcodec/qdm2.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index 4cf4b2f932e..1dfb8d57150 100644
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -1257,6 +1257,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) {
--
GitLab