Mercurial > hg > openjdk > jdk7 > jdk
changeset 3322:ae84db37130a
7007157: (pack200) stripping attributes causes a NPE
Reviewed-by: jrose, mduigou, dholmes
author | ksrini |
---|---|
date | Sat, 18 Dec 2010 09:10:49 -0800 |
parents | 1f0f0737f04e |
children | 449dfb061fde |
files | src/share/classes/com/sun/java/util/jar/pack/ClassReader.java test/tools/pack200/T7007157.java |
diffstat | 2 files changed, 79 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java Fri Dec 17 11:03:33 2010 +0800 +++ b/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java Sat Dec 18 09:10:49 2010 -0800 @@ -350,16 +350,18 @@ if (attrCommands != null) { Object lkey = Attribute.keyForLookup(ctype, name); String cmd = (String) attrCommands.get(lkey); - switch (cmd) { - case "pass": - String message1 = "passing attribute bitwise in " + h; - throw new Attribute.FormatException(message1, ctype, name, cmd); - case "error": - String message2 = "attribute not allowed in " + h; - throw new Attribute.FormatException(message2, ctype, name, cmd); - case "strip": - skip(length, name + " attribute in " + h); - continue; + if (cmd != null) { + switch (cmd) { + case "pass": + String message1 = "passing attribute bitwise in " + h; + throw new Attribute.FormatException(message1, ctype, name, cmd); + case "error": + String message2 = "attribute not allowed in " + h; + throw new Attribute.FormatException(message2, ctype, name, cmd); + case "strip": + skip(length, name + " attribute in " + h); + continue; + } } } // Find canonical instance of the requested attribute.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/pack200/T7007157.java Sat Dec 18 09:10:49 2010 -0800 @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2010, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Map; +import java.util.jar.JarFile; +import java.util.jar.Pack200; +/* + * @test + * @bug 7007157 + * @summary make sure the strip command works on an attribute + * @compile -XDignore.symbol.file Utils.java T7007157.java + * @run main T7007157 + * @author ksrini + */ +public class T7007157 { + + public static void main(String... args) throws IOException { + File sdkHome = Utils.JavaSDK; + File testJar = new File(new File(sdkHome, "lib"), "tools.jar"); + JarFile jarFile = new JarFile(testJar); + File packFile = new File("foo.pack"); + Pack200.Packer packer = Pack200.newPacker(); + Map<String, String> p = packer.properties(); + // Take the time optimization vs. space + p.put(packer.EFFORT, "1"); // CAUTION: do not use 0. + // Make the memory consumption as effective as possible + p.put(packer.SEGMENT_LIMIT, "10000"); + // ignore all JAR deflation requests to save time + p.put(packer.DEFLATE_HINT, packer.FALSE); + // save the file ordering of the original JAR + p.put(packer.KEEP_FILE_ORDER, packer.TRUE); + // strip the StackMapTables + p.put(packer.CODE_ATTRIBUTE_PFX + "StackMapTable", packer.STRIP); + FileOutputStream fos = null; + try { + // Write out to a jtreg scratch area + fos = new FileOutputStream(packFile); + // Call the packer + packer.pack(jarFile, fos); + } finally { + Utils.close(fos); + Utils.close(jarFile); + } + } +}