diff options
| author | Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> | 2017-08-31 15:30:27 +0530 |
|---|---|---|
| committer | Ivan Kutepov <its.kutepov@gmail.com> | 2017-12-09 19:07:26 +0300 |
| commit | d802dad9c29733d7bbf2acc927ea5c3a3600e807 (patch) | |
| tree | 737e202c142084569509fe537dec3def4938c305 /decoder/impeg2d_structs.h | |
| parent | 18ac9f724856f1bb82edff6885aaf302c20e4ef4 (diff) | |
| download | android_external_libmpeg2-d802dad9c29733d7bbf2acc927ea5c3a3600e807.tar.gz android_external_libmpeg2-d802dad9c29733d7bbf2acc927ea5c3a3600e807.tar.bz2 android_external_libmpeg2-d802dad9c29733d7bbf2acc927ea5c3a3600e807.zip | |
Reject Multiple seq_hdr With Different Dimensions
If the decoder gets multiple sequence headers and there is a change in
resolution in the second header (after a reset call), the decoder will now
return an error.
Bug: 65717533
Test: poc before/after on mnc-dev/hammerhead
Change-Id: I4cb9a5f945fc1150f8ae0714bae4a87b07f0945f
CVE-2017-13148
Diffstat (limited to 'decoder/impeg2d_structs.h')
| -rw-r--r-- | decoder/impeg2d_structs.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/decoder/impeg2d_structs.h b/decoder/impeg2d_structs.h index 743b043..02aabf9 100644 --- a/decoder/impeg2d_structs.h +++ b/decoder/impeg2d_structs.h @@ -326,6 +326,9 @@ typedef struct dec_state_struct_t UWORD8 *pu1_chroma_ref_buf[BUF_MGR_MAX_CNT]; ivd_out_bufdesc_t as_disp_buffers[BUF_MGR_MAX_CNT]; + /* Count the number of pictures decoded after init/reset */ + WORD32 i4_pic_count; + /* Flag to signal last coeff in a 8x8 block is one after mismatch contol */ WORD32 i4_last_value_one; |