This is the mail archive of the
java-prs@gcc.gnu.org
mailing list for the Java project.
[Bug libgcj/16032] libgcj should reject class files with incorrect version numbers
- From: "cvs-commit at gcc dot gnu dot org" <gcc-bugzilla at gcc dot gnu dot org>
- To: java-prs at gcc dot gnu dot org
- Date: 17 Apr 2005 21:07:36 -0000
- Subject: [Bug libgcj/16032] libgcj should reject class files with incorrect version numbers
- References: <20040617032108.16032.tromey@gcc.gnu.org>
- Reply-to: gcc-bugzilla at gcc dot gnu dot org
------- Additional Comments From cvs-commit at gcc dot gnu dot org 2005-04-17 21:07 -------
Subject: Bug 16032
CVSROOT: /cvs/gcc
Module name: gcc
Branch: gcjx-branch
Changes by: tromey@gcc.gnu.org 2005-04-17 21:07:22
Modified files:
gcjx : ChangeLog
gcjx/bytecode : verify.cc
libjava : ChangeLog Makefile.in configure configure.ac
defineclass.cc
libjava/include: java-interp.h verify.h
libjava/java/lang: Class.h
Removed files:
libjava : verify.cc
Log message:
gcjx:
* bytecode/verify.cc (branch_prepass): Cast argument to sprintf.
(verify_instructions_0): Likewise.
(VFY_FAST_OPCODES): Changed sense of #ifdef.
libjava:
PR libgcj/16032:
* java/lang/Class.h (Class): Added friend class.
* include/verify.h (vfy_is_15): Implement.
(VFY_FAST_OPCODES): New define.
Updated #includes.
(vfy_is_static): Use Modifier, not ACC_*.
(vfy_is_abstract): Likewise.
(vfy_hand_off_flags): New function.
(vfy_fail): Cast argument to 'append'.
(vfy_get_exceptions): Rewrote.
(vfy_tag): Fixed typo.
(vfy_load_indexes): Use correct slot in constant pool.
(vfy_constants): Changed type.
(vfy_uint_16): Likewise.
(vfy_find_class): Removed argument name.
(vfy_get_pool_class): Likewise.
(vfy_iface_iterator_begin): Likewise.
(vfy_get_interface): Likewise.
(vfy_make_string): Added cast.
(vfy_object_type): Fixed typo.
(vfy_string_type): Likewise.
(vfy_throwable_type): Likewise.
(vfy_class_type): Likewise.
(vfy_fail): Added argument name.
* defineclass.cc (handleCodeAttribute): Set new field.
(MAJOR_1_1, MINOR_1_1, MAJOR_1_2, MINOR_1_2, MAJOR_1_3, MINOR_1_3,
MAJOR_1_4, MINOR_1_4, MAJOR_1_5, MINOR_1_5): New defines.
(parse): Check version numbers.
(_Jv_ClassReader::is_15): New field.
(_Jv_ClassReader): Initialize it.
* include/java-interp.h (_Jv_InterpMethod::is_15): New field.
(class _Jv_InterpException): Added friend class.
(class _Jv_MethodBase): Likewise.
(class _Jv_InterpMethod): Likewise.
* configure, Makefile.in: Rebuilt.
* configure.ac: Create verify.cc as a link.
* verify.cc: Removed.
Patches:
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcjx/ChangeLog.diff?cvsroot=gcc&only_with_tag=gcjx-branch&r1=1.1.2.73&r2=1.1.2.74
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcjx/bytecode/verify.cc.diff?cvsroot=gcc&only_with_tag=gcjx-branch&r1=1.1.2.6&r2=1.1.2.7
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/ChangeLog.diff?cvsroot=gcc&only_with_tag=gcjx-branch&r1=1.3285.2.5&r2=1.3285.2.6
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/Makefile.in.diff?cvsroot=gcc&only_with_tag=gcjx-branch&r1=1.465.2.2&r2=1.465.2.3
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/configure.diff?cvsroot=gcc&only_with_tag=gcjx-branch&r1=1.250.2.1&r2=1.250.2.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/configure.ac.diff?cvsroot=gcc&only_with_tag=gcjx-branch&r1=1.16.2.1&r2=1.16.2.2
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/defineclass.cc.diff?cvsroot=gcc&only_with_tag=gcjx-branch&r1=1.43&r2=1.43.2.1
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/verify.cc.diff?cvsroot=gcc&only_with_tag=gcjx-branch&r1=1.65&r2=NONE
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/include/java-interp.h.diff?cvsroot=gcc&only_with_tag=gcjx-branch&r1=1.27&r2=1.27.4.1
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/include/verify.h.diff?cvsroot=gcc&only_with_tag=gcjx-branch&r1=1.1.2.2&r2=1.1.2.3
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/libjava/java/lang/Class.h.diff?cvsroot=gcc&only_with_tag=gcjx-branch&r1=1.75&r2=1.75.2.1
--
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=16032