commit 3e64548c03301b2163bfded771fba4735bd8193f
author Elliott Hughes <enh@google.com> Mon Oct 10 11:17:13 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 10 11:17:13 2011 -0700
tree 00c7ceb64c7de8bf31061393c268b9cbb8d4165c
parent 5a459d4a923cd2160026cc58e4d3da0858028320
parent 904660c5fa1984f95b43de60ea036feb871cca24

Merge "Don't say UTF-8 in Dalvik's CheckJNI when we mean Modified UTF-8."

vm/analysis/CodeVerify.cpp

diff --git a/vm/analysis/CodeVerify.cpp b/vm/analysis/CodeVerify.cpp
index c21906b..b81dbaf 100644
--- a/vm/analysis/CodeVerify.cpp
+++ b/vm/analysis/CodeVerify.cpp
@@ -1603,6 +1603,7 @@
             LOG_VFY("VFY: register1 v%u type %d, wanted %d",
                 vsrc, srcType, checkType);
             *pFailure = VERIFY_ERROR_GENERIC;
+            break;
         }
         /* Update type if result is float */
         if (checkType == kRegTypeFloat) {
@@ -1618,10 +1619,12 @@
             LOG_VFY("VFY: register2 v%u-%u values %d,%d",
                 vsrc, vsrc+1, insnRegs[vsrc], insnRegs[vsrc+1]);
             *pFailure = VERIFY_ERROR_GENERIC;
+            break;
         } else if (!canConvertTo2(srcType, checkType)) {
             LOG_VFY("VFY: register2 v%u type %d, wanted %d",
                 vsrc, srcType, checkType);
             *pFailure = VERIFY_ERROR_GENERIC;
+            break;
         }
         /* Update type if source is from const */
         if (srcType == kRegTypeConstLo) {