summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-08-20 22:13:36 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-08-20 22:13:36 +0000
commit85554ed1e091f4fa9b97f7452b09b727c18c3d2e (patch)
tree8c8c5c3c36df19fa4648d465a00f8a2e88126761
parent9fe6899662ba6534e488333c5b16f6c52f24af8c (diff)
parentaebaf43c3e908257b124d111884ae86e20c4473a (diff)
Snap for 12252919 from aebaf43c3e908257b124d111884ae86e20c4473a to u-keystone-qcom-release
Change-Id: If7e1ce065e3110ca1fed621bade36ae39a616f87
-rw-r--r--media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp b/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp
index 418302389d..4ab5d10609 100644
--- a/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp
+++ b/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp
@@ -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();