diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2016-12-15 10:55:28 +0530 |
|---|---|---|
| committer | Sean McCreary <mccreary@mcwest.org> | 2017-03-22 12:25:50 -0600 |
| commit | 9c6a714d380f7e957055c72b2de68a8157077efb (patch) | |
| tree | 2ee5e6abed13cba62f87c5cd2e4e4a920290b4d5 | |
| parent | 7de4b33874737b5f0aea0de875f94b26fa5cbdd8 (diff) | |
| download | android_external_libavc-9c6a714d380f7e957055c72b2de68a8157077efb.tar.gz android_external_libavc-9c6a714d380f7e957055c72b2de68a8157077efb.tar.bz2 android_external_libavc-9c6a714d380f7e957055c72b2de68a8157077efb.zip | |
Decoder: Fixed cur_mb_info initialization in error cases
When number of MBs decoded in the current frame is zero and an error is
detected, MB info was unnecessarily decremented in multi-core case.
Bug: 33351708
Bug: 33298089
Bug: 33250932
CVE-2017-0467
CVE-2017-0468
CVE-2017-0482
CVE-2017-0484
Change-Id: I150c48c6fb382736f1de855ba5384c12bf84710d
(cherry picked from commit 902c15251fe53f103f910b9f6a133e4cc7ca7416)
(cherry picked from commit fd9a12f9fdd9dd3e66c59dd7037e864b948085f7)
| -rw-r--r-- | decoder/ih264d_parse_pslice.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/decoder/ih264d_parse_pslice.c b/decoder/ih264d_parse_pslice.c index 1134ef0..78c36c1 100644 --- a/decoder/ih264d_parse_pslice.c +++ b/decoder/ih264d_parse_pslice.c @@ -1591,7 +1591,7 @@ WORD32 ih264d_mark_err_slice_skip(dec_struct_t * ps_dec, { if(ps_dec->u1_separate_parse) { - ps_cur_mb_info = ps_dec->ps_nmb_info - 1; + ps_cur_mb_info = ps_dec->ps_nmb_info; } else { |