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_cavlc.cpp (1 of 14 files). Show all

Unified · Split

codec/decoder/core/src/parse_mb_syn_cavlc.cpp+4−0
@@ -1389,6 +1389,7 @@ int32_t ParseInterBInfo (PWelsDecoderContext pCtx, int16_t iMvArray[LIST_A][30][ · 1388 unmodified lines
13891389 if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
13901390 ref_idx_list[listIdx][0] = 0;
13911391 pCtx->iErrorCode |= dsBitstreamError;
1392+ RETURN_ERR_IF_NULL(ppRefPic[listIdx][ref_idx_list[listIdx][0]]);
13921393 } else {
13931394 return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
13941395 }
@@ -1438,6 +1439,7 @@ int32_t ParseInterBInfo (PWelsDecoderContext pCtx, int16_t iMvArray[LIST_A][30][ · 43 unmodified lines
14381439 if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
14391440 iRefIdx = 0;
14401441 pCtx->iErrorCode |= dsBitstreamError;
1442+ RETURN_ERR_IF_NULL(ppRefPic[listIdx][iRefIdx]);
14411443 } else {
14421444 return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
14431445 }
@@ -1497,6 +1499,7 @@ int32_t ParseInterBInfo (PWelsDecoderContext pCtx, int16_t iMvArray[LIST_A][30][ · 53 unmodified lines
14971499 if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
14981500 iRefIdx = 0;
14991501 pCtx->iErrorCode |= dsBitstreamError;
1502+ RETURN_ERR_IF_NULL(ppRefPic[listIdx][iRefIdx]);
15001503 } else {
15011504 return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
15021505 }
@@ -1643,6 +1646,7 @@ int32_t ParseInterBInfo (PWelsDecoderContext pCtx, int16_t iMvArray[LIST_A][30][ · 140 unmodified lines
16431646 if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
16441647 iref = 0;
16451648 pCtx->iErrorCode |= dsBitstreamError;
1649+ RETURN_ERR_IF_NULL(ppRefPic[listIdx][iref]);
16461650 } else {
16471651 return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
16481652 }

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