commit | 2f667a03842b2ecbdba8df094f2e6e9052c66882 | [log] [tgz] |
---|---|---|
author | Grzegorz Kołodziejczyk <grzegorz.kolodziejczyk@codecoup.pl> | Mon Mar 01 13:58:38 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 01 13:58:38 2021 +0000 |
tree | f0c2f6f96876da857dabe63f2b22dd36ae79b9a0 | |
parent | 203f9a52697b9e67c7a75db4e2478b5582aadc4b [diff] | |
parent | 81624c5ef76ab676e288f25b1ee32b837fbdcf9d [diff] |
audio: Implement OnSessionStarted for HAL 2.1 am: a80a851ada am: 81624c5ef7 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1608075 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie36b0d63792fec5cb3e1d113e546b2e8217cc765
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(); }