Unverified Commit 34fa5d14 authored Sep 04, 2024 by Michael Bestas

Merge tag 'android-14.0.0_r67' into staging/lineage-21.0_merge-android-14.0.0_r67

Android 14.0.0 release 67

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZteF1wAKCRDorT+BmrEO
# eDpBAJ9ogh8GVbvQ2CIGqhRkYPOmSUFHlQCfYigTnasa1esLk6RQSt0CIK9hv5k=
# =p5E5
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Sep  4 00:55:35 2024 EEST
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2593 signatures in the past
#      2 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Wonsik Kim
# Via Android Build Coastguard Worker
* tag 'android-14.0.0_r67':
  omx: check HDR10+ info param size

Change-Id: If0c7605338b861e0b0c352f6a59166d10ca45a4e

parents a2bd7765 4a1053e6

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