commit 85736e213c283f455540dea5ecb38b049b341be2
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Sep 01 13:38:42 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Sep 01 13:38:42 2023 +0000
tree 4c761d4aea1fe8edc1d3eee86f19778587186d98
parent c33a3df9ec45df80f90119ba15c60dedf0a74a72
parent 064bc372c4f2bc847b67c8ee4a8ef991ff0038e4

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23914073'] into tm-qpr3-c-release.

Change-Id: I95de329ec24e9d38c8605b63047e81bd4ac44e24

shim_and_sl/ShimConverter.cpp

diff --git a/shim_and_sl/ShimConverter.cpp b/shim_and_sl/ShimConverter.cpp
index 1ed0e31..4830c5d 100644
--- a/shim_and_sl/ShimConverter.cpp
+++ b/shim_and_sl/ShimConverter.cpp
@@ -150,6 +150,10 @@
                 break;
             }
             case OperandLifeTime::CONSTANT_POOL: {
+                if (operand.location.poolIndex >= memoryPools.size()) {
+                    *errorStatus = ErrorStatus::INVALID_ARGUMENT;
+                    return nullptr;
+                }
                 resultModel.setOperandValueFromMemory(
                         i, memoryPools[operand.location.poolIndex].get(), operand.location.offset,
                         operand.location.length);