Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 20:24:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE

Browse Source 
Merged-In: Ib56dbbc032236ffe012f36dfb83040b06847f455
Merged-In: Ia036416d8c0c90400586f9573c3be66b2ff8ea03
Change-Id: I09f542101304af38614d9d3715c25480bbef6c96
This commit is contained in:
Bill Yi
2021-04-13 19:29:20 -07:00
parent 6594b5f1b4 65b4e4b7bf
commit 89e61b7f9d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drm/1.0/default/CryptoPlugin.cpp
View File

@@ -124,7 +124,11 @@ namespace implementation {
return Void();
}
if (source.offset + offset + source.size > sourceBase->getSize()) {
size_t totalSize = 0;
if (__builtin_add_overflow(source.offset, offset, &totalSize) ||
__builtin_add_overflow(totalSize, source.size, &totalSize) ||
totalSize > sourceBase->getSize()) {
android_errorWriteLog(0x534e4554, "176496160");
_hidl_cb(Status::ERROR_DRM_CANNOT_HANDLE, 0, "invalid buffer size");
return Void();
}