archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 19:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8024804: Crash when InterfaceMethodref resolves to Object.registerNatives

Browse source 
Added check for NULL prior to continuation of method look up to avoid runtime crash during look up of Object's superclass' methods.

Reviewed-by: coleenp, hseigel
This commit is contained in:
Lois Foltan 2013-10-16 14:32:05 -04:00 • committed by Harold Seigel
parent ec5d05699e
commit 21627fb02f
2 changed files with 47 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hotspot/src/share/vm/interpreter/linkResolver.cpp
View file

@ -248,7 +248,7 @@ void LinkResolver::lookup_method_in_klasses(methodHandle& result, KlassHandle kl
void LinkResolver::lookup_instance_method_in_klasses(methodHandle& result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) {
Method* result_oop = klass->uncached_lookup_method(name, signature);
result = methodHandle(THREAD, result_oop);
while (!result.is_null() && result->is_static()) {
while (!result.is_null() && result->is_static() && result->method_holder()->super() != NULL) {
klass = KlassHandle(THREAD, result->method_holder()->super());
result = methodHandle(THREAD, klass->uncached_lookup_method(name, signature));
}

46
hotspot/test/runtime/8024804/RegisterNatives.java Normal file
View file

@ -0,0 +1,46 @@
/*
* Copyright (c) 2013, 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 8024804
* @summary registerNatives() interface resolution should receive IAE
* @run main RegisterNatives
*/
public class RegisterNatives {
interface I { void registerNatives(); }
interface J extends I {}
static class B implements J { public void registerNatives() { System.out.println("B"); } }
public static void main(String... args) {
System.out.println("Regression test for JDK-8024804, crash when InterfaceMethodref resolves to Object.registerNatives\n");
J val = new B();
try {
val.registerNatives();
} catch (IllegalAccessError e) {
System.out.println("TEST PASSES - according to current JVM spec, IAE expected\n");
return;
}
System.out.println("TEST FAILS - no IAE resulted\n");
System.exit(1);
}
}