Avoid a failed assert on invalid channel indices

Fixes: 14914/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_LIBFDK_AAC_fuzzer-6288430994030592 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
mstorsjo · Oct 8, 2019 · e90ed2c · e90ed2c
1 parent 4fe5edb
commit e90ed2c
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/libPCMutils/src/pcmdmx_lib.cpp b/libPCMutils/src/pcmdmx_lib.cpp
@@ -583,6 +583,9 @@ static PCMDMX_ERROR getChannelMode(
         (channelType[ch] & 0x0F) - 1,
         0); /* Assign all undefined channels (ACT_NONE) to front channels. */
 
+    if (channelIndices[ch] >= numCh[channelType[ch] >> 4][chGrp])
+      return PCMDMX_INVALID_CH_CONFIG;
+
     spkrPos[ch] = getSpeakerPos(channelType[ch], channelIndices[ch],
                                 numCh[channelType[ch] >> 4][chGrp]);