changeset 5173:6f03dfb50363 jdk7u65-b08

Merge
author asaha
date Mon, 14 Apr 2014 08:45:59 -0700
parents f30a8a82c54f f0f39dbf68aa
children 4ceb9c03fe8e f5cb7599f587 6b37a189944a
files
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/classfile/verifier.cpp	Mon Apr 14 08:43:38 2014 -0700
+++ b/src/share/vm/classfile/verifier.cpp	Mon Apr 14 08:45:59 2014 -0700
@@ -2301,6 +2301,11 @@
       methodOop 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(