Snap for 7120117 from 5ac6a8ff3d to tm-release

Change-Id: Ia1a1df6704abf32d3696fd67479ff33bf929155f
This commit is contained in:
android-build-team Robot
2021-02-03 04:11:57 +00:00

View File

@@ -199,7 +199,11 @@ Return<void> WVCryptoPlugin::decrypt_1_2(
return Void();
}
if (source.offset + offset + source.size > sourceBase->getSize()) {
size_t totalSrcSize = 0;
if (__builtin_add_overflow(source.offset, offset, &totalSrcSize) ||
__builtin_add_overflow(totalSrcSize, source.size, &totalSrcSize) ||
totalSrcSize > sourceBase->getSize()) {
android_errorWriteLog(0x534e4554, "176496160");
_hidl_cb(Status_V1_2::ERROR_DRM_CANNOT_HANDLE, 0, "invalid buffer size");
return Void();
}