commit c2e8824a7a841a1dedfdd2ee617804d4165f6229
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Sep 01 12:08:34 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Sep 01 12:08:34 2023 +0000
tree 4c761d4aea1fe8edc1d3eee86f19778587186d98
parent beaa8f02570ed4e0c1970070666a13f3b708e5ae
parent ee1ce405b0ed1cea5514fcb14e32b031a153247d

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

Change-Id: If3738785f1fe63d9a78488032c240f4d909b87c0

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);