add check for cabac_init_idc range in parsing
Showing the changes to codec/decoder/core/src/decoder_core.cpp (1 of 2 files). Show all
Unified · Split
| @@ -469,6 +469,7 @@ void DecodeNalHeaderExt (PNalUnit pNal, uint8_t* pSrc) { · 468 unmodified lines | |||
| 469 | #define SLICE_HEADER_INTER_LAYER_ALPHAC0_BETA_OFFSET_MIN -12 | 469 | #define SLICE_HEADER_INTER_LAYER_ALPHAC0_BETA_OFFSET_MIN -12 |
| 470 | #define SLICE_HEADER_INTER_LAYER_ALPHAC0_BETA_OFFSET_MAX 12 | 470 | #define SLICE_HEADER_INTER_LAYER_ALPHAC0_BETA_OFFSET_MAX 12 |
| 471 | #define MAX_NUM_REF_IDX_L0_ACTIVE_MINUS1 15 | 471 | #define MAX_NUM_REF_IDX_L0_ACTIVE_MINUS1 15 |
| 472 | #define SLICE_HEADER_CABAC_INIT_IDC_MAX 2 | ||
| 472 | /* | 473 | /* |
| 473 | * decode_slice_header_avc | 474 | * decode_slice_header_avc |
| 474 | * Parse slice header of bitstream in avc for storing data structure | 475 | * Parse slice header of bitstream in avc for storing data structure |
| @@ -729,6 +730,8 @@ int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, co · 254 unmodified lines | |||
| 729 | if (pSliceHead->eSliceType != I_SLICE && pSliceHead->eSliceType != SI_SLICE) { | 730 | if (pSliceHead->eSliceType != I_SLICE && pSliceHead->eSliceType != SI_SLICE) { |
| 730 | WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); | 731 | WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); |
| 731 | pSliceHead->iCabacInitIdc = uiCode; | 732 | pSliceHead->iCabacInitIdc = uiCode; |
| 733 | WELS_CHECK_SE_UPPER_ERROR (pSliceHead->iCabacInitIdc, SLICE_HEADER_CABAC_INIT_IDC_MAX, "cabac_init_idc", | ||
| 734 | ERR_INFO_INVALID_CABAC_INIT_IDC); | ||
| 732 | } else | 735 | } else |
| 733 | pSliceHead->iCabacInitIdc = 0; | 736 | pSliceHead->iCabacInitIdc = 0; |
| 734 | } | 737 | } |