Mercurial > hg > openjdk > jdk6 > langtools
changeset 146:c9b0fee44d44
6715767: javap on java.lang.ClassLoader crashes
Reviewed-by: ksrini
author | jjg |
---|---|
date | Wed, 18 Jun 2008 16:53:08 -0700 |
parents | 3cbaa3d49584 |
children | 00870be9028f |
files | src/share/classes/com/sun/tools/classfile/ConstantPool.java src/share/classes/com/sun/tools/javap/AttributeWriter.java src/share/classes/com/sun/tools/javap/ClassWriter.java src/share/classes/com/sun/tools/javap/JavapTask.java test/tools/javap/T6715767.java |
diffstat | 5 files changed, 64 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/classfile/ConstantPool.java Thu Oct 24 02:40:06 2013 +0100 +++ b/src/share/classes/com/sun/tools/classfile/ConstantPool.java Wed Jun 18 16:53:08 2008 -0700 @@ -153,7 +153,7 @@ break; case CONSTANT_String: - pool[i] = new CONSTANT_String_info(cr); + pool[i] = new CONSTANT_String_info(this, cr); break; case CONSTANT_Utf8: @@ -509,7 +509,8 @@ } public static class CONSTANT_String_info extends CPInfo { - CONSTANT_String_info(ClassReader cr) throws IOException { + CONSTANT_String_info(ConstantPool cp, ClassReader cr) throws IOException { + super(cp); string_index = cr.readUnsignedShort(); }
--- a/src/share/classes/com/sun/tools/javap/AttributeWriter.java Thu Oct 24 02:40:06 2013 +0100 +++ b/src/share/classes/com/sun/tools/javap/AttributeWriter.java Wed Jun 18 16:53:08 2008 -0700 @@ -259,7 +259,7 @@ return null; } - String getJavaException(Exceptions_attribute attr, int index) { + private String getJavaException(Exceptions_attribute attr, int index) { try { return getJavaName(attr.getException(index, constant_pool)); } catch (ConstantPoolException e) {
--- a/src/share/classes/com/sun/tools/javap/ClassWriter.java Thu Oct 24 02:40:06 2013 +0100 +++ b/src/share/classes/com/sun/tools/javap/ClassWriter.java Wed Jun 18 16:53:08 2008 -0700 @@ -291,7 +291,7 @@ for (int i = 0; i < exceptions.number_of_exceptions; i++) { if (i > 0) print(", "); - print(attrWriter.getJavaException(exceptions, i)); + print(getJavaException(exceptions, i)); } } } else { @@ -441,6 +441,14 @@ } } + String getJavaException(Exceptions_attribute attr, int index) { + try { + return getJavaName(attr.getException(index, constant_pool)); + } catch (ConstantPoolException e) { + return report(e); + } + } + String getValue(Descriptor d) { try { return d.getValue(constant_pool);
--- a/src/share/classes/com/sun/tools/javap/JavapTask.java Thu Oct 24 02:40:06 2013 +0100 +++ b/src/share/classes/com/sun/tools/javap/JavapTask.java Wed Jun 18 16:53:08 2008 -0700 @@ -475,6 +475,7 @@ t.printStackTrace(pw); pw.close(); diagnosticListener.report(createDiagnostic("err.crash", t.toString(), sw.toString())); + ok = false; } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javap/T6715767.java Wed Jun 18 16:53:08 2008 -0700 @@ -0,0 +1,50 @@ +/* + * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/* + * @test + * @bug 6715767 + * @summary javap on java.lang.ClassLoader crashes + */ + +import java.io.*; + +public class T6715767 { + public static void main(String... args) throws Exception { + new T6715767().run(); + } + + void run() throws Exception { + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + String[] args = { "java.lang.ClassLoader" }; + int rc = com.sun.tools.javap.Main.run(args, pw); + if (rc != 0 || + sw.toString().indexOf("at com.sun.tools.javap.JavapTask.run") != -1) { + System.err.println("rc: " + rc); + System.err.println("log:\n" + sw); + throw new Exception("unexpected result"); + } + } +} +