commit 96fca1a3cb6b364dda37724fd709aa1bd13ca62f
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Jul 17 19:38:43 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Jul 17 19:38:43 2023 +0000
tree 81fc124462697869cd290da74adb50984e6cdde3
parent 2c58e226a4783859975d137e775caee1ef606337
parent 84f7ba9045eacb585af34f1b7c60585d541a66bc

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23914070'] into sc-platform-release.

Change-Id: If7dada691e4f23d27370f4395ce9a6f8f29868ed

shim_and_sl/ShimConverter.cpp

diff --git a/shim_and_sl/ShimConverter.cpp b/shim_and_sl/ShimConverter.cpp
index b0f914c..b8619d0 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);