commit | 25b4a133ea6d393a78e9d998a97f161876bfdca3 | [log] [tgz] |
---|---|---|
author | Sarah Chin <sarahchin@google.com> | Wed Mar 03 19:29:48 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 03 19:29:48 2021 +0000 |
tree | 41ab532291e065f6cc4796347ec432869d3f917f | |
parent | 9c570e0cd3d6b771d64752bb30c7b3e41add0b65 [diff] | |
parent | a6ce4c80e84b0c7f61b268dc1f18608c03ff35b8 [diff] |
Merge "API updates for TrafficDescriptr fields" am: c2ccef2e2a am: a6ce4c80e8 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1593911 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icae1969e60d61ed92fcc1caff55eab0ad5b8ff8a
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(); }