diff options
| author | Harish Mahendrakar <harish.mahendrakar@ittiam.com> | 2016-12-15 18:04:53 +0530 |
|---|---|---|
| committer | Sean McCreary <mccreary@mcwest.org> | 2017-03-22 12:25:51 -0600 |
| commit | d018f5d82d9a917915488e8cb2a22c67688ab788 (patch) | |
| tree | 08d0ee0e2a1ed13ecaabd39146b555e598a27840 | |
| parent | b0a8e2d2b803cd968cc54184b0f9b30cf741ae49 (diff) | |
| download | android_external_libavc-d018f5d82d9a917915488e8cb2a22c67688ab788.tar.gz android_external_libavc-d018f5d82d9a917915488e8cb2a22c67688ab788.tar.bz2 android_external_libavc-d018f5d82d9a917915488e8cb2a22c67688ab788.zip | |
Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases
Bug: 34097213
Bug: 33641588
CVE-2017-0488
Change-Id: I40a6c5af7f1e46e1623ae1b399db3073123390fe
(cherry picked from commit 1d5640f2f9013e8de68cedc3e57a6b02b495b3c2)
(cherry picked from commit 0340381cd8c220311fd4fe2e8b23e1534657e399)
| -rw-r--r-- | decoder/ih264d_parse_slice.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/decoder/ih264d_parse_slice.c b/decoder/ih264d_parse_slice.c index a907e81..11a317b 100644 --- a/decoder/ih264d_parse_slice.c +++ b/decoder/ih264d_parse_slice.c @@ -1343,6 +1343,8 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice, ps_cur_slice->u1_redundant_pic_cnt = u1_redundant_pic_cnt; ps_cur_slice->u1_nal_ref_idc = u1_nal_ref_idc; ps_cur_slice->u1_pic_order_cnt_type = u1_pic_order_cnt_type; + ps_cur_slice->u1_mbaff_frame_flag = ps_seq->u1_mb_aff_flag + && (!u1_field_pic_flag); } } else |