summaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authoraph <aph@138bc75d-0d04-0410-961f-82ee72b054a4>2007-09-09 14:55:45 +0000
committeraph <aph@138bc75d-0d04-0410-961f-82ee72b054a4>2007-09-09 14:55:45 +0000
commit19a46b0dba54a9ce592c0cdd9c8bd1064b2a151b (patch)
tree6a8a5a8d152290df4442d980d66046b5c2abe875 /libjava
parentb5f8cffe570514b8bd02597c6e647fdd0a3ae824 (diff)
downloadgcc-19a46b0dba54a9ce592c0cdd9c8bd1064b2a151b.tar.gz
* interpret-run.cc (invokevirtual_resolved): Nullcheck object on
TOS. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@128298 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-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 a9458e94859..dd86f277197 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 1eea57e1f9e..fc2e1e514c1 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);