| commit | f495c326a014499d00e40c39757fe241cf24188a | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Wed Mar 03 08:07:45 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 03 08:07:45 2021 +0000 |
| tree | 7a68ca0480f50aa9d358010cad1edf6347b4dd8e | |
| parent | 1165b395c4f0de00b49d40c241d30166e9a98f9c [diff] | |
| parent | 92372dc28d61de493d1ee3a16a2f60496a7990e3 [diff] |
Merge "Add fields related to active audio presentation rendering" am: 947b82bee2 am: 92372dc28d Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1591515 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id85840e0065ff02d4e296f3290832573b1a0d84a
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(); }