* interpret.cc (compile): Handle case where table entry is

	outside of PC range.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@101298 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c81a79b..af57bb6 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-24  Tom Tromey  <tromey@redhat.com>
+
+       * interpret.cc (compile): Handle case where table entry is
+       outside of PC range.
+
 2005-06-23  Bryce McKinlay  <mckinlay@redhat.com>
 
        * testsuite/libjava.compile/PR20697.java: New test-case.

diff --git a/libjava/interpret.cc b/libjava/interpret.cc
index e7d8992..355b5b9 100644 (file)
--- a/libjava/interpret.cc
+++ b/libjava/interpret.cc
@@ -1,6 +1,6 @@
 // interpret.cc - Code for the interpreter
 
-/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation
+/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
 
    This file is part of libgcj.
 
@@ -763,6 +763,10 @@ _Jv_InterpMethod::compile (const void * const *insn_targets)
   for (int i = 0; i < line_table_len; i++)
     {
       int byte_pc = line_table[i].bytecode_pc;
+      // It isn't worth throwing an exception if this table is
+      // corrupted, but at the same time we don't want a crash.
+      if (byte_pc < 0 || byte_pc >= code_length)
+       byte_pc = 0;
       line_table[i].pc = &insns[pc_mapping[byte_pc]];
     }