commit 3ffb952e86d5f822f083a10e6cf5837034261887
author Naveen Kumar P <naveenkumar.p@ittiam.com> Mon Jul 10 18:08:04 2017 +0530
committer android-build-team Robot <android-build-team-robot@google.com> Fri Dec 01 00:15:16 2017 +0000
tree 3bf69d81be9f7399f6a72746682ce9e38d50061a
parent d0eaf4ec6112a32311b56f828bba3a939ccf7609

Fix slice address zero for not first slice in pic

The parameter slice address is parsed only slices that are not
first slice in the pic and the value cannot be zero.

Bug: 64380202
Test: ran PoC on master
Change-Id: Ic21c40cf67c916806113d2425790a27cb658b5d2
(cherry picked from commit ed3f6bb877ae9e241afd6a6a13d5a6afd692ddc0)

decoder/ihevcd_parse_slice_header.c

diff --git a/decoder/ihevcd_parse_slice_header.c b/decoder/ihevcd_parse_slice_header.c
index d216322..8dd3b13 100644
--- a/decoder/ihevcd_parse_slice_header.c
+++ b/decoder/ihevcd_parse_slice_header.c
@@ -357,7 +357,7 @@
         slice_address = value;
         /* If slice address is greater than the number of CTBs in a picture,
          * ignore the slice */
-        if(value >= ps_sps->i4_pic_size_in_ctb)
+        if(value >= ps_sps->i4_pic_size_in_ctb || value <= 0)
             return IHEVCD_IGNORE_SLICE;
     }
     else