commit 7798a614753251adf7a77835792d78db2e93f5ff
author Elliott Hughes <enh@google.com> Sun Jul 01 22:11:48 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Sun Jul 01 22:11:48 2012 -0700
tree b9e3e784860af5b73ee388853427b20d842b7c83
parent 7c03fb79290de74c8f855275c0878e31a968665b
parent 0bd15512ca35f8c77d743166807ce60684f21123

Merge "Fix a possible off-by-one in the verifier."

vm/analysis/CodeVerify.cpp

diff --git a/vm/analysis/CodeVerify.cpp b/vm/analysis/CodeVerify.cpp
index 1149307..6016fd1 100644
--- a/vm/analysis/CodeVerify.cpp
+++ b/vm/analysis/CodeVerify.cpp
@@ -3797,7 +3797,7 @@
             if (instr == kPackedSwitchSignature ||
                 instr == kSparseSwitchSignature ||
                 instr == kArrayDataSignature ||
-                (instr == OP_NOP &&
+                (instr == OP_NOP && (insnIdx + 1 < insnsSize) &&
                  (meth->insns[insnIdx+1] == kPackedSwitchSignature ||
                   meth->insns[insnIdx+1] == kSparseSwitchSignature ||
                   meth->insns[insnIdx+1] == kArrayDataSignature)))