# HG changeset patch
# User asaha
# Date 1397491816 25200
# Node ID 4c40343ecdb33fe046833fe4b8970fd29859c4ad
# Parent  47f10bcd16b2392b310864489b41db67aa23365c# Parent  b5ae226b7516460566347e45980e01b10a02b47d
Merge

diff -r 47f10bcd16b2 -r 4c40343ecdb3 src/share/vm/classfile/verifier.cpp
--- 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(