Merge "[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt" into pi-dev (d651cdcf) · Commits · e / os / android_frameworks_av

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -106,6 +106,8 @@ Return<void> CryptoPlugin::decrypt(
	return Void();		return Void();
	}		}

			base = static_cast<uint8_t >(static_cast<void >(destBase->getPointer()));

	if (destBuffer.offset + destBuffer.size > destBase->getSize()) {		if (destBuffer.offset + destBuffer.size > destBase->getSize()) {
	_hidl_cb(Status::ERROR_DRM_CANNOT_HANDLE, 0, "invalid buffer size");		_hidl_cb(Status::ERROR_DRM_CANNOT_HANDLE, 0, "invalid buffer size");
	return Void();		return Void();