8296196: Class.getEnumConstants() throws undocumented ClassCastException and NullPointerException
Reviewed-by: darcy
This commit is contained in:
parent
78a08a0f21
commit
e802b124b7
@ -3934,7 +3934,8 @@ public final class Class<T> implements java.io.Serializable,
|
|||||||
// These can happen when users concoct enum-like classes
|
// These can happen when users concoct enum-like classes
|
||||||
// that don't comply with the enum spec.
|
// that don't comply with the enum spec.
|
||||||
catch (InvocationTargetException | NoSuchMethodException |
|
catch (InvocationTargetException | NoSuchMethodException |
|
||||||
IllegalAccessException ex) { return null; }
|
IllegalAccessException | NullPointerException |
|
||||||
|
ClassCastException ex) { return null; }
|
||||||
}
|
}
|
||||||
return constants;
|
return constants;
|
||||||
}
|
}
|
||||||
|
34
test/jdk/java/lang/Class/getEnumConstants/BadEnum1.jasm
Normal file
34
test/jdk/java/lang/Class/getEnumConstants/BadEnum1.jasm
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2022, 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
super final enum class BadEnum1 extends java/lang/Enum
|
||||||
|
version 52:0
|
||||||
|
{
|
||||||
|
public Method values:"()[LBadEnum1;"
|
||||||
|
stack 1
|
||||||
|
{
|
||||||
|
iconst_0;
|
||||||
|
anewarray BadEnum1;
|
||||||
|
areturn;
|
||||||
|
}
|
||||||
|
}
|
36
test/jdk/java/lang/Class/getEnumConstants/BadEnum2.jasm
Normal file
36
test/jdk/java/lang/Class/getEnumConstants/BadEnum2.jasm
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2022, 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
super final enum class BadEnum2
|
||||||
|
extends java/lang/Enum
|
||||||
|
version 52:0
|
||||||
|
{
|
||||||
|
public static Method values:"()Ljava/lang/Object;"
|
||||||
|
stack 2
|
||||||
|
{
|
||||||
|
new class java/lang/Object;
|
||||||
|
dup;
|
||||||
|
invokespecial Method java/lang/Object."<init>":"()V";
|
||||||
|
areturn;
|
||||||
|
}
|
||||||
|
}
|
47
test/jdk/java/lang/Class/getEnumConstants/BadEnumTest.java
Normal file
47
test/jdk/java/lang/Class/getEnumConstants/BadEnumTest.java
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2022, 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @test
|
||||||
|
* @bug 8296196
|
||||||
|
* @summary Test getEnumConstants on bad Enums
|
||||||
|
* @build BadEnum1 BadEnum2
|
||||||
|
* @run junit BadEnumTest
|
||||||
|
*/
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
|
||||||
|
public class BadEnumTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testBadEnum1() {
|
||||||
|
assertNull(BadEnum1.class.getEnumConstants(), "Expected BadEnum1.class.getEnumConstants() to return null");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testBadEnum2() {
|
||||||
|
assertNull(BadEnum2.class.getEnumConstants(), "Expected BadEnum2.class.getEnumConstants() to return null");
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user