Merge pull request cisco#3293 from xiaotianshi2/issue_20491

Fix oss-fuzz 20491. OpenH264 issue cisco#3282
muse117 · Jun 24, 2020 · 68b51e8 · 68b51e8
2 parents f43dddc + 9890676
commit 68b51e8
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/codec/decoder/core/src/manage_dec_ref.cpp b/codec/decoder/core/src/manage_dec_ref.cpp
@@ -394,7 +394,10 @@ int32_t WelsReorderRefList (PWelsDecoderContext pCtx) {
  for (int32_t listIdx = 0; listIdx < ListCount; ++listIdx) {
  PPicture pPic = NULL;
  PPicture* ppRefList = pCtx->sRefPic.pRefList[listIdx];
- int32_t iMaxRefIdx = pCtx->iPicQueueNumber;
+ int32_t iMaxRefIdx = pCtx->iPicQueueNumber;
+ if (iMaxRefIdx >= MAX_REF_PIC_COUNT) {
+ iMaxRefIdx = MAX_REF_PIC_COUNT - 1;
+ }
  int32_t iRefCount = pSliceHeader->uiRefCount[listIdx];
  int32_t iPredFrameNum = pSliceHeader->iFrameNum;
  int32_t iMaxPicNum = 1 << pSliceHeader->pSps->uiLog2MaxFrameNum;