| commit | e198860c27621b790665e9aa281ad08395d3e4cb | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Mar 02 03:07:31 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 02 03:07:31 2021 +0000 |
| tree | 974e7918d24e40d80d46dd7fac58620671afe7f2 | |
| parent | 3cf408ed724b094131544c675cc6dfb1f7e214b0 [diff] | |
| parent | aff567a81f603b344c86fb780aea3ad97db89427 [diff] |
Merge "[automotive] Use new jsoncpp API" am: 3d22587ce7 am: aff567a81f Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1608216 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9b1a532ed68fcfd3b4570abbf9cd7b1bf329ff8d
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(); }