Mercurial > hg > truffle

diff src/share/vm/interpreter/linkResolver.cpp @ 12934:d248425bcfe8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8024804: Crash when InterfaceMethodref resolves to Object.registerNatives Summary: 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 Contributed-by: lois.foltan@oracle.com
author hseigel
date Wed, 16 Oct 2013 14:32:05 -0400
parents 2f8728d92483
children ee99e1a7c5fb
line wrap: on
line diff
--- a/src/share/vm/interpreter/linkResolver.cpp	Wed Oct 16 09:20:23 2013 +0200
+++ b/src/share/vm/interpreter/linkResolver.cpp	Wed Oct 16 14:32:05 2013 -0400
@@ -248,7 +248,7 @@
 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));
   }