diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-14 08:06:23 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-14 08:06:23 +0000 |
| commit | 3eb086787cdd21f239604101f1ca3d07a35bc75f (patch) | |
| tree | 35c4ebf59f0e00c286ef26892f8539de674c1dfe | |
| parent | 071d96af5b6b4edbdf9473680a34fcddae653a8f (diff) | |
| parent | 8dfdf7a12408d0159f405a5484c3d0dbb81bdb0b (diff) | |
| download | android_external_libavc-3eb086787cdd21f239604101f1ca3d07a35bc75f.tar.gz android_external_libavc-3eb086787cdd21f239604101f1ca3d07a35bc75f.tar.bz2 android_external_libavc-3eb086787cdd21f239604101f1ca3d07a35bc75f.zip | |
release-request-b06579bd-a905-4db5-ada9-c69d40f4df90-for-git_pi-release-4335309 snap-temp-L62700000102430107
Change-Id: Ifd7041ebb1eac1fb741e482970c83ede945b4350
| -rw-r--r-- | decoder/ih264d_parse_bslice.c | 3 | ||||
| -rw-r--r-- | decoder/ih264d_parse_pslice.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/decoder/ih264d_parse_bslice.c b/decoder/ih264d_parse_bslice.c index 4418429..f087f8d 100644 --- a/decoder/ih264d_parse_bslice.c +++ b/decoder/ih264d_parse_bslice.c @@ -1399,7 +1399,8 @@ WORD32 ih264d_parse_bslice(dec_struct_t * ps_dec, UWORD16 u2_first_mb_in_slice) { u1_max_ref_idx = MAX_FRAMES << 1; } - if((u4_temp > u1_max_ref_idx) || (ui_temp1 > u1_max_ref_idx)) + if((u4_temp > u1_max_ref_idx) || (ui_temp1 > u1_max_ref_idx) + || (u4_temp < 1) || (ui_temp1 < 1)) { return ERROR_NUM_REF; } diff --git a/decoder/ih264d_parse_pslice.c b/decoder/ih264d_parse_pslice.c index d6b0f23..9b9256b 100644 --- a/decoder/ih264d_parse_pslice.c +++ b/decoder/ih264d_parse_pslice.c @@ -1961,7 +1961,7 @@ WORD32 ih264d_parse_pslice(dec_struct_t *ps_dec, UWORD16 u2_first_mb_in_slice) UWORD8 u1_max_ref_idx = MAX_FRAMES << u1_field_pic_flag; - if(u4_temp > u1_max_ref_idx) + if(u4_temp > u1_max_ref_idx || u4_temp < 1) { return ERROR_NUM_REF; } |