diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-18 11:26:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-18 11:26:53 +0100 |
| commit | 96008082dbd3a2475ad429b02bf73ba20b4ea9bf (patch) | |
| tree | 6f441d4c7afbdb359c98dac5d5420ab5f9be4764 /libavcodec/qdm2.c | |
| parent | c63f9fb37a7b7da03bed6d79115f7f2e36607808 (diff) | |
| parent | 488f87be873506abb01d67708a67c10a4dd29283 (diff) | |
| download | ffmpeg-96008082dbd3a2475ad429b02bf73ba20b4ea9bf.tar.gz | |
Merge commit '488f87be873506abb01d67708a67c10a4dd29283'
* commit '488f87be873506abb01d67708a67c10a4dd29283':
roqvideodec: check dimensions validity
vqavideo: check chunk sizes before reading chunks
qdm2: check array index before use, fix out of array accesses
Conflicts:
libavcodec/qdm2.c
libavcodec/roqvideodec.c
libavcodec/vqavideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/qdm2.c')
| -rw-r--r-- | libavcodec/qdm2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index 387a3c6a3b..c0c80a1fe7 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -1257,7 +1257,7 @@ 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)) { + if (i >= FF_ARRAY_ELEMS(q->sub_packet_list_A)) { SAMPLES_NEEDED_2("too many packet bytes"); return; } |