changeset 17584:4c40343ecdb3 jdk8u11-b04

Merge
author asaha
date Mon, 14 Apr 2014 09:10:16 -0700
parents 47f10bcd16b2 b5ae226b7516
children a4d44dfb7d30
files
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/classfile/verifier.cpp	Mon Apr 14 09:08:01 2014 -0700
+++ b/src/share/vm/classfile/verifier.cpp	Mon Apr 14 09:10:16 2014 -0700
@@ -2307,6 +2307,11 @@
       Method* m = InstanceKlass::cast(ref_klass)->uncached_lookup_method(
         vmSymbols::object_initializer_name(),
         cp->signature_ref_at(bcs->get_index_u2()));
+      if (m == NULL) {
+        verify_error(ErrorContext::bad_code(bci),
+            "Call to missing <init> method");
+        return;
+      }
       instanceKlassHandle mh(THREAD, m->method_holder());
       if (m->is_protected() && !mh->is_same_class_package(_klass())) {
         bool assignable = current_type().is_assignable_from(