summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAkshata Jadhav <akshata.jadhav@ittiam.com>2018-02-21 06:09:52 (GMT)
committermse1969 <mse1969@posteo.de>2018-06-08 17:28:59 (GMT)
commit7543af526cdd066e9445e61b55d3305184f62af1 (patch)
tree0e704537ea0ad3b1300ed3b51dc094cae2faf0db
parentc5d2f14158573fd7223f1bb4f7726633a7551530 (diff)
downloadandroid_external_libavc-cm-13.0.zip
android_external_libavc-cm-13.0.tar.gz
android_external_libavc-cm-13.0.tar.bz2
Encoder: Return error for odd resolutionHEADreplicant-6.0-0004-rc1cm-13.0
Bug: 73625898 Test: ran POC before/after under ASAN Change-Id: I9765b57f4afc6a2b6ad9cd19c8c7c5000beb9de9 (cherry picked from commit 9fa58d4db3ef176ed54af5f602970b48624be413) CVE-2018-9351
-rw-r--r--encoder/ih264e_api.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/encoder/ih264e_api.c b/encoder/ih264e_api.c
index 69085ab..b40be55 100644
--- a/encoder/ih264e_api.c
+++ b/encoder/ih264e_api.c
@@ -1147,6 +1147,24 @@ static IV_STATUS_T api_check_struct_sanity(iv_obj_t *ps_handle,
return (IV_FAIL);
}
+ if(ps_ip->s_ive_ip.u4_wd & 1)
+ {
+ ps_op->s_ive_op.u4_error_code |= 1
+ << IVE_UNSUPPORTEDPARAM;
+ ps_op->s_ive_op.u4_error_code |=
+ IH264E_WIDTH_NOT_SUPPORTED;
+ return (IV_FAIL);
+ }
+
+ if(ps_ip->s_ive_ip.u4_ht & 1)
+ {
+ ps_op->s_ive_op.u4_error_code |= 1
+ << IVE_UNSUPPORTEDPARAM;
+ ps_op->s_ive_op.u4_error_code |=
+ IH264E_HEIGHT_NOT_SUPPORTED;
+ return (IV_FAIL);
+ }
+
break;
}