commit f017013522f5f580074ccbf5cf552a711cdc1914
author Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> Fri Jun 09 12:12:03 2017 +0530
committer android-build-team Robot <android-build-team-robot@google.com> Thu Sep 21 20:54:50 2017 +0000
tree 7f27de3dc9165ca5b5ae862ee97b1d32632f8d63
parent 0d309eec8832fc61cd9f3137cfa9cf49ad8be2b5

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
(cherry picked from commit c07e83250dcdc3be3eca434c266472be8fddec5f)

decoder/impeg2d_dec_hdr.c

diff --git a/decoder/impeg2d_dec_hdr.c b/decoder/impeg2d_dec_hdr.c
index b35a846..46502c4 100644
--- a/decoder/impeg2d_dec_hdr.c
+++ b/decoder/impeg2d_dec_hdr.c
@@ -1768,7 +1768,11 @@
                 {
                     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;