summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaveen Kumar Ponnusamy <naveenkumar.p@ittiam.com>2017-02-15 13:58:22 +0530
committerSean McCreary <mccreary@mcwest.org>2017-05-23 10:57:50 -0600
commite3f83a5ce98c6a006a45cb065849d029f734af48 (patch)
tree67e34fefa925cfa2bc024baaf8986223cd19a4a3
parent0f2c17885d77692f5017e372793a407057afc45c (diff)
downloadandroid_external_libhevc-e3f83a5ce98c6a006a45cb065849d029f734af48.tar.gz
android_external_libhevc-e3f83a5ce98c6a006a45cb065849d029f734af48.tar.bz2
android_external_libhevc-e3f83a5ce98c6a006a45cb065849d029f734af48.zip
Handle error return from ref list in slice hdr parsing
The error returned by ref_list function was not handled by the caller parse_slice_header. Bug: 34672748 AOSP-Change-Id: I55f6cb0e651746e77f7ff3375115894ec3964203 (cherry picked from commit 25206ffa6eeb25f32103e69f893287425ab1bd10) CVE-2017-0599 Change-Id: Idab5c9503268d099c60b0d996312b0e774d61cb3 (cherry picked from commit a1424724a00d62ac5efa0e27953eed66850d662f)
-rw-r--r--decoder/ihevcd_parse_slice_header.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/decoder/ihevcd_parse_slice_header.c b/decoder/ihevcd_parse_slice_header.c
index e9c3073..744484e 100644
--- a/decoder/ihevcd_parse_slice_header.c
+++ b/decoder/ihevcd_parse_slice_header.c
@@ -910,7 +910,11 @@ IHEVCD_ERROR_T ihevcd_parse_slice_header(codec_t *ps_codec,
}
else
{
- ihevcd_ref_list(ps_codec, ps_pps, ps_sps, ps_slice_hdr);
+ ret = ihevcd_ref_list(ps_codec, ps_pps, ps_sps, ps_slice_hdr);
+ if ((WORD32)IHEVCD_SUCCESS != ret)
+ {
+ return ret;
+ }
}