aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Haley <aph@redhat.com>2007-09-09 14:55:45 +0000
committerAndrew Haley <aph@gcc.gnu.org>2007-09-09 14:55:45 +0000
commitf144591b54e4bd5cd794c514fd421e226903cf74 (patch)
tree6a8a5a8d152290df4442d980d66046b5c2abe875
parent61ce048a279aac6108021ad4db795318ed5d5c21 (diff)
downloadgcc-f144591b54e4bd5cd794c514fd421e226903cf74.zip
gcc-f144591b54e4bd5cd794c514fd421e226903cf74.tar.gz
gcc-f144591b54e4bd5cd794c514fd421e226903cf74.tar.bz2
interpret-run.cc (invokevirtual_resolved): Nullcheck object on TOS.
* interpret-run.cc (invokevirtual_resolved): Nullcheck object on TOS. From-SVN: r128298
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/interpret-run.cc1
2 files changed, 6 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a9458e9..dd86f27 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-09 Andrew Haley <aph@redhat.com>
+
+ * interpret-run.cc (invokevirtual_resolved): Nullcheck object on
+ TOS.
+
2007-09-06 Tom Tromey <tromey@redhat.com>
* testsuite/libjava.lang/StackTrace2.jar: Rebuilt.
diff --git a/libjava/interpret-run.cc b/libjava/interpret-run.cc
index 1eea57e..fc2e1e5 100644
--- a/libjava/interpret-run.cc
+++ b/libjava/interpret-run.cc
@@ -563,6 +563,7 @@ details. */
}
else
{
+ NULLCHECK (sp[0].o);
jobject rcv = sp[0].o;
_Jv_VTable *table = *(_Jv_VTable**) rcv;
fun = (void (*)()) table->get_method (rmeth->method->index);