diff options
| author | Naveen Kumar P <naveenkumar.p@ittiam.com> | 2017-10-12 15:28:20 +0530 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-11-28 03:27:28 +0000 |
| commit | 066e3b1f9c954d95045bc9d33d2cdc9df419784f (patch) | |
| tree | c7ccf341df8197ffb25df6959fc845f4bc64bf17 | |
| parent | b3f31e493ef6fa886989198da9787807635eaae2 (diff) | |
| download | libhevc-066e3b1f9c954d95045bc9d33d2cdc9df419784f.tar.gz | |
Return error for negative crop parameters
Bug: 65398821
Change-Id: I18a94d40d77504bb9c9d5a5e7bf41207aed28712
Signed-off-by: Sungtak Lee <taklee@google.com>
(cherry picked from commit 978d3320ef3dc60f69f8c4ba215b869d11b03944)
| -rw-r--r-- | decoder/ihevcd_parse_headers.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/decoder/ihevcd_parse_headers.c b/decoder/ihevcd_parse_headers.c index a7ec5ad..578a429 100644 --- a/decoder/ihevcd_parse_headers.c +++ b/decoder/ihevcd_parse_headers.c @@ -1363,28 +1363,28 @@ IHEVCD_ERROR_T ihevcd_parse_sps(codec_t *ps_codec) { UEV_PARSE("pic_crop_left_offset", value, ps_bitstrm); - if (value >= ps_sps->i2_pic_width_in_luma_samples) + if (value < 0 || value >= ps_sps->i2_pic_width_in_luma_samples) { return IHEVCD_INVALID_PARAMETER; } ps_sps->i2_pic_crop_left_offset = value; UEV_PARSE("pic_crop_right_offset", value, ps_bitstrm); - if (value >= ps_sps->i2_pic_width_in_luma_samples) + if (value < 0 || value >= ps_sps->i2_pic_width_in_luma_samples) { return IHEVCD_INVALID_PARAMETER; } ps_sps->i2_pic_crop_right_offset = value; UEV_PARSE("pic_crop_top_offset", value, ps_bitstrm); - if (value >= ps_sps->i2_pic_height_in_luma_samples) + if (value < 0 || value >= ps_sps->i2_pic_height_in_luma_samples) { return IHEVCD_INVALID_PARAMETER; } ps_sps->i2_pic_crop_top_offset = value; UEV_PARSE("pic_crop_bottom_offset", value, ps_bitstrm); - if (value >= ps_sps->i2_pic_height_in_luma_samples) + if (value < 0 || value >= ps_sps->i2_pic_height_in_luma_samples) { return IHEVCD_INVALID_PARAMETER; } |