| commit | 8718ed41fb84456a247b929a5ababe0782f10f6c | [log] [tgz] |
|---|---|---|
| author | Rambo Wang <rambowang@google.com> | Wed Mar 10 02:50:57 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 10 02:50:57 2021 +0000 |
| tree | b01aeaaf1b017e5c0830a5ca70e26e27bb31883e | |
| parent | 5df8053163beba7d76e95432fea1c406d1ee8f89 [diff] | |
| parent | defdc18a9dc9b27db7e068650342229cb3bb9932 [diff] |
Merge "Skip radio VTS test cases on deprecated interfaces" am: 43175bec27 am: defdc18a9d Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1591095 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3260a0531d726b1321c17f6da9394a099f35405d
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(); }