diff options
| author | Devin Moore <devinmoore@google.com> | 2022-06-02 18:01:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-02 18:01:21 +0000 |
| commit | ca829730333018516a2bbb67184db33f7ffe737a (patch) | |
| tree | 55f62eba155f0ebac2d0655af30b0b9327d1d57e | |
| parent | 10332b2d20169d19e648606256671a2dfed05e33 (diff) | |
| parent | 2b686fcd97ec8650069657086ef186bb7a386b84 (diff) | |
| download | libhidl-ca829730333018516a2bbb67184db33f7ffe737a.tar.gz | |
Check size of grantors before indexing into the vec am: 2b686fcd97
Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/2113745
Change-Id: Ic8fd2985753a8bb1955adaca127c0304527294ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | base/include/hidl/MQDescriptor.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/base/include/hidl/MQDescriptor.h b/base/include/hidl/MQDescriptor.h index 0429444..38ac325 100644 --- a/base/include/hidl/MQDescriptor.h +++ b/base/include/hidl/MQDescriptor.h @@ -181,7 +181,11 @@ MQDescriptor<T, flavor>::~MQDescriptor() { template<typename T, MQFlavor flavor> size_t MQDescriptor<T, flavor>::getSize() const { - return static_cast<size_t>(mGrantors[details::DATAPTRPOS].extent); + if (mGrantors.size() > details::DATAPTRPOS) { + return static_cast<size_t>(mGrantors[details::DATAPTRPOS].extent); + } else { + return 0; + } } template<typename T, MQFlavor flavor> |