| commit | e6d56be030957b83700f279a5aeb8ce3ec6af2a7 | [log] [tgz] |
|---|---|---|
| author | Slava Shklyaev <slavash@google.com> | Tue Mar 09 14:24:39 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 09 14:24:39 2021 +0000 |
| tree | ce796e801ad3bee195f0eec3ea0667887eed279d | |
| parent | 215365f120c634aab1c1e501ef54e6ebdc827078 [diff] | |
| parent | 22dbbbe66ae5f9a87353a01a501c17765e564c15 [diff] |
Merge "Fix formatting" am: ce5a77cfcd am: 22dbbbe66a Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1621099 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8317e21e6a96d33814d40b2e8e6e2c13e9694540
diff --git a/drm/1.0/default/CryptoPlugin.cpp b/drm/1.0/default/CryptoPlugin.cpp index 2db3607..e6d4e84 100644 --- a/drm/1.0/default/CryptoPlugin.cpp +++ b/drm/1.0/default/CryptoPlugin.cpp
@@ -124,7 +124,11 @@ 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(); }