| commit | 5e8b252609a435c00eceb04c92d1e1dc662085d7 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Mar 03 20:53:56 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 03 20:53:56 2021 +0000 |
| tree | a4ef2f8684c81c7ee34f9c742a3e084518d6584f | |
| parent | 25b4a133ea6d393a78e9d998a97f161876bfdca3 [diff] | |
| parent | a40f50ddc0bd2c930911d9e54d41636d5db8b75b [diff] |
Merge "audio: Verify that VTS tests can work with vendor extensions" am: a8b93afc00 am: a40f50ddc0 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1612588 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifa1b0a45fd1b5bfb5726401d3d256b702344fc7a
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(); }