eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-14 11:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/qdm2: Do not read out of array in fix_coding_method_array()

Browse Source 
Instead we ask for a sample, its unclear what to do in this case.

Fixes: index 30 out of bounds for type 'int8_t [30][64]'
Fixes: 15339/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_QDM2_fuzzer-5749441484554240

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit ae021c1239)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2019-06-24 01:01:02 +02:00
parent dd59d92e94
commit e5c21ed6e3
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/qdm2.c
View File

@@ -408,7 +408,12 @@ static int fix_coding_method_array(int sb, int channels,
} }
for (k = 0; k < run; k++) { for (k = 0; k < run; k++) {
if (j + k < 128) { if (j + k < 128) {
if (coding_method[ch][sb + (j + k) / 64][(j + k) % 64] > coding_method[ch][sb][j]) { int sbjk = sb + (j + k) / 64;
if (sbjk > 29) {
SAMPLES_NEEDED
continue;
}
if (coding_method[ch][sbjk][(j + k) % 64] > coding_method[ch][sb][j]) {
if (k > 0) { if (k > 0) {
SAMPLES_NEEDED SAMPLES_NEEDED
//not debugged, almost never used //not debugged, almost never used