Check size of grantors before indexing into the vec am: 2b686fcd97 am: ca82973033 am: 75b22bfaa5 am: 683af4f033 am: 7a75a85d7d
Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/2113745
Change-Id: Ifcb885ebca8eb759a9093303b60a5cdb58ab36aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 @@
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>