commit 44dfaf6053b80d7dfcbeef8d75280249e7004267
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sun Jul 09 21:19:22 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sun Jul 09 21:19:22 2023 +0000
tree d6174d70d84fd677dc24f79140246ff0a043b7ac
parent 1309f567843b8b392f9613c895d223948dd1d369
parent c78d67240636c1bce363d1769b7a9a1c668bc907

Snap for 10463383 from c78d67240636c1bce363d1769b7a9a1c668bc907 to udc-d1-release

Change-Id: Id31992cc676f3ed356f565eaea01fd9d2d5fa153

shim_and_sl/ShimConverter.cpp

diff --git a/shim_and_sl/ShimConverter.cpp b/shim_and_sl/ShimConverter.cpp
index ed3cda2..9914af1 100644
--- a/shim_and_sl/ShimConverter.cpp
+++ b/shim_and_sl/ShimConverter.cpp
@@ -154,6 +154,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);