Merge "Fix Heap buffer overflow in clearkey releaseSecureStops" (dae12aeb) · Commits · e / os / android_frameworks_av

drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -797,7 +797,8 @@ Return<void> DrmPlugin::getSecureStopIds(getSecureStopIds_cb _hidl_cb) {
		}

		Return<Status> DrmPlugin::releaseSecureStops(const SecureStopRelease& ssRelease) {
		if (ssRelease.opaqueData.size() == 0) {
		// minimum opaqueData contains the uint32_t count, see comment below
		if (ssRelease.opaqueData.size() < sizeof(uint32_t)) {
		return Status::BAD_VALUE;
		}