summaryrefslogtreecommitdiffstats
path: root/decoder/ih264d_parse_pslice.c
diff options
context:
space:
mode:
authorHarish Mahendrakar <harish.mahendrakar@ittiam.com>2017-01-05 13:48:55 +0530
committerSean McCreary <mccreary@mcwest.org>2017-04-05 19:16:28 -0600
commit36a82ac79d2409bb629a6482758bf4fd00906439 (patch)
tree53541ce552d68cfabe6e63c5cb495d9d7627a371 /decoder/ih264d_parse_pslice.c
parent85820c2befe6d5814f2bcf51ddef3e02a5442c3d (diff)
downloadandroid_external_libavc-36a82ac79d2409bb629a6482758bf4fd00906439.tar.gz
android_external_libavc-36a82ac79d2409bb629a6482758bf4fd00906439.tar.bz2
android_external_libavc-36a82ac79d2409bb629a6482758bf4fd00906439.zip
Decoder: Return correct error code for slice header errors
Return ERROR_INV_SLICE_HDR_T instead of ERROR_INV_SPS_PPS_T for slice header errors. Bug: 34097915 AOSP-Change-Id: I45d14a71f2322ff349058baaf65fb0f3c1140fba CVE-2017-0552 Change-Id: I4c87503f9014f67721fb3a06a7542215d4f10cd6 (cherry picked from commit 9a00f562a612d56e7b2b989d168647db900ba6cf)
Diffstat (limited to 'decoder/ih264d_parse_pslice.c')
-rw-r--r--decoder/ih264d_parse_pslice.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/decoder/ih264d_parse_pslice.c b/decoder/ih264d_parse_pslice.c
index 5e30b42..171ed16 100644
--- a/decoder/ih264d_parse_pslice.c
+++ b/decoder/ih264d_parse_pslice.c
@@ -1504,7 +1504,7 @@ WORD32 ih264d_mark_err_slice_skip(dec_struct_t * ps_dec,
//if valid SPS PPS is not found return error
if(j == -1)
{
- return ERROR_INV_SPS_PPS_T;
+ return ERROR_INV_SLICE_HDR_T;
}
/* call ih264d_start_of_pic only if it was not called earlier*/