diff options
| author | Devin Moore <devinmoore@google.com> | 2022-06-02 18:45:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-02 18:45:50 +0000 |
| commit | 683af4f033ac809e04f056c216656598def8399c (patch) | |
| tree | 292f44b3b127b5f03846d9f535b095ad070e68c7 | |
| parent | 4f9e612aa73d4dd2ad5e38895f61d31696c71d61 (diff) | |
| parent | 75b22bfaa51a8e8cb9fe169d7d74bebb46ebfd93 (diff) | |
| download | libhidl-683af4f033ac809e04f056c216656598def8399c.tar.gz | |
Check size of grantors before indexing into the vec am: 2b686fcd97 am: ca82973033 am: 75b22bfaa5
Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/2113745
Change-Id: I7ce9a9da4bd990c144276ea275bcef3521a660f1
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> |