commit 7e06940dce7245f03fd950edf7f72ff321b2b451
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Wed Dec 02 11:54:47 2020 -0800
committer Ray Essick <essick@google.com> Fri Dec 04 16:09:10 2020 -0800
tree 6cbff8ce3a5e20e57303083d35372adcfc3b2eb7
parent f64194a96f3291757d149a1da1075cc5448bc265

decoder: Update check for first mb in slice

first_mb_in_slice shouldn't be >= mbs in the picture.

Test: poc in bugs
Bug: b/174238784
Bug: b/174507022
Bug: oss-fuzz:27856
Bug: oss-fuzz:28039
Change-Id: Id3a41c8c2ddf814910fc2d5dd4f57bdd84d28fec

decoder/ih264d_parse_slice.c

diff --git a/decoder/ih264d_parse_slice.c b/decoder/ih264d_parse_slice.c
index b477c10..cf2dda9 100644
--- a/decoder/ih264d_parse_slice.c
+++ b/decoder/ih264d_parse_slice.c
@@ -1090,7 +1090,7 @@
     u2_first_mb_in_slice = ih264d_uev(pu4_bitstrm_ofst,
                                      pu4_bitstrm_buf);
     if(u2_first_mb_in_slice
-                    > (ps_dec->u2_frm_ht_in_mbs * ps_dec->u2_frm_wd_in_mbs))
+                    >= (ps_dec->u2_frm_ht_in_mbs * ps_dec->u2_frm_wd_in_mbs))
     {
 
         return ERROR_CORRUPTED_SLICE;