| commit | 8327b1c91bba5857dd4f14e2c31dd9b912eeb666 | [log] [tgz] |
|---|---|---|
| author | Devin Moore <devinmoore@google.com> | Thu Jun 02 20:52:31 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 02 20:52:31 2022 +0000 |
| tree | a6a627176c7de2d71d2c7826d73311c08a20b520 | |
| parent | bcf9b47de53408e675cb40a8eb30a198ca9b620e [diff] | |
| parent | bb3228676ddc09fa51c70f48f10e5540e8054704 [diff] |
Check size of grantors before indexing into the vec am: bb3228676d Original change: https://android-review.googlesource.com/c/platform/system/libfmq/+/2114169 Change-Id: Iedcd8a3b8a0a63f02e5fbc44f435f6df90247801 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/include/fmq/AidlMQDescriptorShim.h b/include/fmq/AidlMQDescriptorShim.h index e3d3cb9..de175da 100644 --- a/include/fmq/AidlMQDescriptorShim.h +++ b/include/fmq/AidlMQDescriptorShim.h
@@ -230,7 +230,11 @@ template <typename T, MQFlavor flavor> size_t AidlMQDescriptorShim<T, flavor>::getSize() const { - return mGrantors[hardware::details::DATAPTRPOS].extent; + if (mGrantors.size() > hardware::details::DATAPTRPOS) { + return mGrantors[hardware::details::DATAPTRPOS].extent; + } else { + return 0; + } } template <typename T, MQFlavor flavor>