Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25b7cc78 authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

omx: check HDR10+ info param size am: f816148a am: cc57ee47 am: 4b693c0a am: dd41492a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/28105102



Change-Id: Idd43d72d0a67fb0eb65e6a04340f018053820400
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 26f1b610 dd41492a

media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp

+7 −0
Original line number Original line Diff line number Diff line
@@ -619,6 +619,13 @@ OMX_ERRORTYPE SoftVideoDecoderOMXComponent::getConfig( 
                if (!isValidOMXParam(outParams)) {

                if (!isValidOMXParam(outParams)) {

                    return OMX_ErrorBadParameter;

                    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();

                outParams->nParamSizeUsed = info->size();