commit 689d9f0cee08a3baaa85a85fb365c7b99f503617
author Ian Rogers <irogers@google.com> Tue Nov 20 16:30:29 2012 -0800
committer Ian Rogers <irogers@google.com> Tue Nov 20 16:30:29 2012 -0800
tree 2c684c3da51864c2855cdff642ad3393ae37c483
parent 58bf0c6d756ff59d3b50d3e90bcdada92b2c933f

Missing return for interpreter iput/get NPE.

Change-Id: I50f9fa5f6fd38af59a8fb8e8ad266f753f677a0c

src/interpreter/interpreter.cc

diff --git a/src/interpreter/interpreter.cc b/src/interpreter/interpreter.cc
index 33d2e59..5c8ccdf 100644
--- a/src/interpreter/interpreter.cc
+++ b/src/interpreter/interpreter.cc
@@ -422,6 +422,7 @@
       obj = shadow_frame.GetReference(dec_insn.vB);
       if (UNLIKELY(obj == NULL)) {
         ThrowNullPointerExceptionForFieldAccess(f, true);
+        return;
       }
     }
     switch (field_type) {
@@ -468,6 +469,7 @@
       obj = shadow_frame.GetReference(dec_insn.vB);
       if (UNLIKELY(obj == NULL)) {
         ThrowNullPointerExceptionForFieldAccess(f, false);
+        return;
       }
     }
     switch (field_type) {