History

Merge remote-tracking branch 'upstream/master'

Sigrid Solveig Haflínudóttir committed 5 years ago

Commit 3eb2a132 parents a313955 c435fb914 files · +2356 −2337Browse files

Showing the changes to codec/decoder/core/src/parse_mb_syn_cabac.cpp (1 of 14 files). Show all

Unified · Split

codec/decoder/core/src/parse_mb_syn_cabac.cpp+4−0
@@ -777,6 +777,7 @@ int32_t ParseInterBMotionInfoCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pN · 776 unmodified lines
777777 if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
778778 iRef[listIdx] = 0;
779779 pCtx->iErrorCode |= dsBitstreamError;
780+ RETURN_ERR_IF_NULL(pCtx->sRefPic.pRefList[listIdx][iRef[listIdx]]);
780781 } else {
781782 return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
782783 }
@@ -814,6 +815,7 @@ int32_t ParseInterBMotionInfoCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pN · 31 unmodified lines
814815 if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
815816 ref_idx = 0;
816817 pCtx->iErrorCode |= dsBitstreamError;
818+ RETURN_ERR_IF_NULL(pCtx->sRefPic.pRefList[listIdx][ref_idx]);
817819 } else {
818820 return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
819821 }
@@ -858,6 +860,7 @@ int32_t ParseInterBMotionInfoCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pN · 38 unmodified lines
858860 if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
859861 ref_idx = 0;
860862 pCtx->iErrorCode |= dsBitstreamError;
863+ RETURN_ERR_IF_NULL(pCtx->sRefPic.pRefList[listIdx][ref_idx]);
861864 } else {
862865 return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
863866 }
@@ -992,6 +995,7 @@ int32_t ParseInterBMotionInfoCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pN · 128 unmodified lines
992995 if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
993996 iref = 0;
994997 pCtx->iErrorCode |= dsBitstreamError;
998+ RETURN_ERR_IF_NULL(pCtx->sRefPic.pRefList[listIdx][iref]);
995999 } else {
9961000 return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
9971001 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t