| commit | 215365f120c634aab1c1e501ef54e6ebdc827078 | [log] [tgz] |
|---|---|---|
| author | SongFerng Wang <songferngwang@google.com> | Tue Mar 09 13:25:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 09 13:25:55 2021 +0000 |
| tree | a389239891777d80670448222f01b5aa96e024e7 | |
| parent | 21b21cc47a750a7a8bd706c1828d701187e90770 [diff] | |
| parent | 3ab5bb0c2c792dbeb97a758fb6a6ad400280f674 [diff] |
Merge "Rename AllowedNetworkType to AllowedNetworkTypes" am: d24ac0c097 am: 3ab5bb0c2c Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1615259 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1b7bfe80fbd9dba7745a8157718e9b2a8061546d
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(); }