From 6a05987083f4bb8812017baa0e3a134d21a4095e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 24 Jun 2005 22:04:11 +0000 Subject: [PATCH] interpret.cc (compile): Handle case where table entry is outside of PC range. * interpret.cc (compile): Handle case where table entry is outside of PC range. From-SVN: r101298 --- libjava/ChangeLog | 5 +++++ libjava/interpret.cc | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c81a79b..af57bb6 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2005-06-24 Tom Tromey + + * interpret.cc (compile): Handle case where table entry is + outside of PC range. + 2005-06-23 Bryce McKinlay * testsuite/libjava.compile/PR20697.java: New test-case. diff --git a/libjava/interpret.cc b/libjava/interpret.cc index e7d8992..355b5b9 100644 --- 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]]; } -- 2.7.4