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

Commit 397d064c authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28105102']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28105102'] into security-aosp-udc-release.

Change-Id: I31217bbc6c23310d82bbd7137b3ee7106fa001b4
parents 85d15302 6d23fa05

media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp

+7 −0
Original line number Diff line number Diff line
@@ -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();