Merge cherrypicks of ['googleplex-android-review.googlesource.com/27847399'] into 24Q3-release.

Change-Id: I33f8f9a3c29d8dd3c74564c2df1963bc72756070
This commit is contained in:
Android Build Coastguard Worker 2024-07-25 04:16:50 +00:00
commit 1863cb0ea5

View file

@ -619,6 +619,13 @@ OMX_ERRORTYPE SoftVideoDecoderOMXComponent::getConfig(
if (!isValidOMXParam(outParams)) {
return OMX_ErrorBadParameter;
}
if (offsetof(DescribeHDR10PlusInfoParams, nValue) + outParams->nParamSize >
outParams->nSize) {
ALOGE("b/329641908: too large param size; nParamSize=%u nSize=%u",
outParams->nParamSize, outParams->nSize);
android_errorWriteLog(0x534e4554, "329641908");
return OMX_ErrorBadParameter;
}
outParams->nParamSizeUsed = info->size();