[FFmpeg-cvslog] qdm2: check array index before use, fix out of array accesses
Michael Niedermayer
git at videolan.org
Thu Jan 16 21:43:34 CET 2014
ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 30 23:59:40 2012 +0100| [b5736759eefab9d546668731bb6d06273edce012] | committer: Reinhard Tartler
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 at gmx.at>
(cherry picked from commit a7ee6281f7ef1c29284e3a4cadfe0f227ffde1ed)
CC: libav-stable at libav.org
Signed-off-by: Reinhard Tartler <siretart at tauware.de>
(cherry picked from commit 39bec05ed42e505d17877b0c23f16322f9b5883b)
Signed-off-by: Reinhard Tartler <siretart at tauware.de>
(cherry picked from commit 0b2b8ab979624b0cce673d5e99255482d7c553ad)
Signed-off-by: Reinhard Tartler <siretart at tauware.de>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b5736759eefab9d546668731bb6d06273edce012
---
libavcodec/qdm2.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index 1a07623..6b11b46 100644
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -1250,6 +1250,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) {
More information about the ffmpeg-cvslog
mailing list