| commit | 203f9a52697b9e67c7a75db4e2478b5582aadc4b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Mar 01 05:37:34 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 01 05:37:34 2021 +0000 |
| tree | e874df388b40de551dd34dad61e71ce2aff8a54f | |
| parent | e9c1715004c4c71738ab5d9f0e82408a18275d6a [diff] | |
| parent | 368514dadb6e3bddf04490340ac7bc11b5772347 [diff] |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces" am: be9a813aec am: 368514dadb Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1609853 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I11ed379a5f1722d9b2ba69327a2cb99e4515d62b
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(); }