From 4f516d572d09b7b3d38b0819131484d60768ca3b Mon Sep 17 00:00:00 2001
From: hseigel <unknown>
Date: Fri, 20 Feb 2015 08:44:11 -0500
Subject: [PATCH] 8064335: Null pointer dereference in
 hotspot/src/share/vm/classfile/verifier.cpp Summary: use correct CHECK macro
 in call to load_class() Reviewed-by: coleenp, lfoltan, gziemski

---
 src/share/vm/classfile/verifier.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/share/vm/classfile/verifier.cpp b/src/share/vm/classfile/verifier.cpp
index 9a059b2d1..10a703775 100644
--- a/src/share/vm/classfile/verifier.cpp
+++ b/src/share/vm/classfile/verifier.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, 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
@@ -2488,8 +2488,7 @@ void ClassVerifier::verify_invoke_init(
     // of the current class.
     VerificationType objectref_type = new_class_type;
     if (name_in_supers(ref_class_type.name(), current_class())) {
-      Klass* ref_klass = load_class(
-        ref_class_type.name(), CHECK_VERIFY(this));
+      Klass* ref_klass = load_class(ref_class_type.name(), CHECK);
       Method* m = InstanceKlass::cast(ref_klass)->uncached_lookup_method(
         vmSymbols::object_initializer_name(),
         cp->signature_ref_at(bcs->get_index_u2()), Klass::normal);
-- 
GitLab