# HG changeset patch
# User hseigel
# Date 1424439851 18000
# Node ID ecdf1e03db40f20fe0d85cc204670b78a6743526
# Parent  0a5d6848237395fc5a299ed21a2b09c15ac7d028
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

diff -r 0a5d68482373 -r ecdf1e03db40 src/share/vm/classfile/verifier.cpp
--- a/src/share/vm/classfile/verifier.cpp	Tue Feb 17 11:00:18 2015 -0800
+++ b/src/share/vm/classfile/verifier.cpp	Fri Feb 20 08:44:11 2015 -0500
@@ -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 @@
     // 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);