diff options
| author | Omkar Sai Sandeep Katadi (xWF) <okatadi@google.com> | 2024-08-20 17:18:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-08-20 17:18:54 +0000 |
| commit | aebaf43c3e908257b124d111884ae86e20c4473a (patch) | |
| tree | 8c8c5c3c36df19fa4648d465a00f8a2e88126761 | |
| parent | 11cfd9f7ed0064d12a87619e8e5faf82cb93d6fd (diff) | |
| parent | cb9af123301936e4c393472f3dff93dbe2fe9226 (diff) | |
Merge "Merge u-mpr-2024-09" into u-keystone-qcom-dev
| -rw-r--r-- | media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp | 7 |
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(); |