| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | gst-ffmpeg: qdm2: check array index before use, fix out of array |
| 2 | accesses |
| 3 | |
| 4 | Upstream-Status: Backport |
| 5 | |
| 6 | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind |
| 7 | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> |
| 8 | --- |
| 9 | libavcodec/qdm2.c | 5 +++++ |
| 10 | 1 files changed, 5 insertions(+), 0 deletions(-) |
| 11 | |
| 12 | diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c |
| 13 | index 4cf4b2f..1dfb8d5 100644 |
| 14 | --- a/gst-libs/ext/libav/libavcodec/qdm2.c |
| 15 | +++ b/gst-libs/ext/libav/libavcodec/qdm2.c |
| 16 | @@ -1257,6 +1257,11 @@ static void qdm2_decode_super_block (QDM2Context *q) |
| 17 | for (i = 0; packet_bytes > 0; i++) { |
| 18 | int j; |
| 19 | |
| 20 | + if (i>=FF_ARRAY_ELEMS(q->sub_packet_list_A)) { |
| 21 | + SAMPLES_NEEDED_2("too many packet bytes"); |
| 22 | + return; |
| 23 | + } |
| 24 | + |
| 25 | q->sub_packet_list_A[i].next = NULL; |
| 26 | |
| 27 | if (i > 0) { |
| 28 | -- |
| 29 | 1.7.5.4 |
| 30 | |