diff options
author | Hamsalekha S <hamsalekha.s@ittiam.com> | 2017-05-10 14:23:48 +0530 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-24 17:17:58 +0000 |
commit | abb5cfba2bceb487bffe813c05f6f19666fe3ca4 (patch) | |
tree | 95583f495496ad2beca0bb868a57db30534fd91b | |
parent | c2d3ce5ef0f86eff65696f57b01474523594e944 (diff) | |
download | android_external_libavc-abb5cfba2bceb487bffe813c05f6f19666fe3ca4.tar.gz android_external_libavc-abb5cfba2bceb487bffe813c05f6f19666fe3ca4.tar.bz2 android_external_libavc-abb5cfba2bceb487bffe813c05f6f19666fe3ca4.zip |
Decoder: Added an error check while parsing PPS.
Added an error check while parsing PPS syntax element
second_chroma_qp_index_offset.
Bug: 37207120
Change-Id: Icba6b7bcf5940505717ee61134ed801c221b6e26
(cherry picked from commit 62f98981ffc29082dd4bbf173a043a5bcbb86652)
-rw-r--r-- | decoder/ih264d_parse_headers.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/decoder/ih264d_parse_headers.c b/decoder/ih264d_parse_headers.c index 0bc4c3f..3807a14 100644 --- a/decoder/ih264d_parse_headers.c +++ b/decoder/ih264d_parse_headers.c @@ -361,11 +361,13 @@ WORD32 ih264d_parse_pps(dec_struct_t * ps_dec, dec_bit_stream_t * ps_bitstrm) } /* read second_chroma_qp_index_offset syntax element */ - ps_pps->i1_second_chroma_qp_index_offset = ih264d_sev( + i_temp = ih264d_sev( pu4_bitstrm_ofst, pu4_bitstrm_buf); - if((ps_pps->i1_second_chroma_qp_index_offset + 12) > 24) + if((i_temp < -12) || (i_temp > 12)) return ERROR_INV_RANGE_QP_T; + + ps_pps->i1_second_chroma_qp_index_offset = i_temp; } /* In case bitstream read has exceeded the filled size, then |