| commit | 8cdbc44d7fb463ff768b842074fafb6d76da8f70 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Feb 24 01:48:15 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 24 01:48:15 2021 +0000 |
| tree | f292c84f1a152b85d5911e5e4ec9fb2d4c0d09c6 | |
| parent | 4b4a5e62da9f6b5d3624e912c74ec182dff0ae02 [diff] | |
| parent | 258ed67a3a191449cea6e5c80de6147e74611019 [diff] |
Merge "Reformat neuralnetworks/1.2/types.hal according to clang-format" am: cefd92ec83 am: 258ed67a3a Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1599276 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iebe94d71f91b40c5b45776a70fef6ffaf9f32e0d
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(); }