diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-08 23:35:26 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-08 23:35:26 +0000 |
| commit | bc1b9ea4de15dc5d400e7f085fbdfe2c1a695aab (patch) | |
| tree | d2f481cc11196bb83009e81fe5cd9a513e066dfb | |
| parent | d5db008f17594b8ea13c33a33dca777bd5a57b86 (diff) | |
| parent | 69ac35d37c0fcf43ac3dac6c99dbec5ecb258c41 (diff) | |
| download | libmpeg2-oreo-m4-s6-release.tar.gz | |
Merge cherrypicks of [4027695, 4027696, 4025411, 4025412, 4026839, 4025429, 4025430, 4025346, 4025347, 4025348, 4025413, 4025414, 4027656, 4027657, 4027658, 4027659, 4027097, 4027098, 4027099, 4027100, 4027101, 4027715, 4027716, 4025431, 4025349, 4027697, 4027698, 4027699, 4027700, 4027701, 4027702, 4027703, 4027704, 4027706, 4025432, 4025433, 4027708, 4027709, 4026841, 4027662, 4027664, 4027666] into sparse-4732991-L45700000171084049android-8.1.0_r32oreo-m4-s6-release
Change-Id: Idb32752e3570baba9e0e147f7127738edc5d9989
| -rw-r--r-- | decoder/impeg2d_pnb_pic.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/decoder/impeg2d_pnb_pic.c b/decoder/impeg2d_pnb_pic.c index a3ae436..f7937a8 100644 --- a/decoder/impeg2d_pnb_pic.c +++ b/decoder/impeg2d_pnb_pic.c @@ -299,6 +299,11 @@ WORD32 impeg2d_dec_pnb_mb_params(dec_state_t *ps_dec) { u2_mb_addr_incr = impeg2d_get_mb_addr_incr(ps_stream); + if(0 == u2_mb_addr_incr) + { + return IV_FAIL; + } + if(ps_dec->u2_first_mb) { /****************************************************************/ |