diff options
| author | Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> | 2017-06-09 12:12:03 +0530 |
|---|---|---|
| committer | Ivan Kutepov <its.kutepov@gmail.com> | 2017-11-10 17:41:31 +0300 |
| commit | 1800f931945438368243423b03426500d47343a3 (patch) | |
| tree | 934ad5c48733ab2655fcf0e196e4b47b404f6349 | |
| parent | 11387d5a07c69fdd98d3376dc438c7744ed7ae2a (diff) | |
| download | android_external_libmpeg2-1800f931945438368243423b03426500d47343a3.tar.gz android_external_libmpeg2-1800f931945438368243423b03426500d47343a3.tar.bz2 android_external_libmpeg2-1800f931945438368243423b03426500d47343a3.zip | |
Propagating Error From impeg2d_pre_pic_dec_proc
In case the function impeg2d_pre_pic_dec_proc returns an error,
the decoder should not try to continue decode.
Bug: 63316832
Test: ran POC under ASAN on patched master
Change-Id: Ib6eed075ac879fb944ca3da70b75d4d723ab93e6
CVE-2017-0835
| -rw-r--r-- | decoder/impeg2d_dec_hdr.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/decoder/impeg2d_dec_hdr.c b/decoder/impeg2d_dec_hdr.c index 27903b7..215301c 100644 --- a/decoder/impeg2d_dec_hdr.c +++ b/decoder/impeg2d_dec_hdr.c @@ -1733,7 +1733,11 @@ IMPEG2D_ERROR_CODES_T impeg2d_process_video_bit_stream(dec_state_t *ps_dec) { return e_error; } - impeg2d_pre_pic_dec_proc(ps_dec); + e_error = impeg2d_pre_pic_dec_proc(ps_dec); + if ((IMPEG2D_ERROR_CODES_T) IVD_ERROR_NONE != e_error) + { + return e_error; + } impeg2d_dec_pic_data(ps_dec); impeg2d_post_pic_dec_proc(ps_dec); u4_start_code_found = 1; |