archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 14:24:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8008750: [partfait] Null pointer deference in hotspot/src/share/vm/oops/instanceKlass.hpp

Browse source 
Fix null pointer

Reviewed-by: kvn, coleenp
This commit is contained in:
Morris Meyer 2013-03-05 18:03:36 -08:00
parent 0e378a1283
commit 15108cd14e
2 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
hotspot/src/share/vm/oops/instanceKlass.cpp
View file

@ -2170,7 +2170,11 @@ void InstanceKlass::clean_implementors_list(BoolObjectClosure* is_alive) {
if (impl != NULL) {
if (!impl->is_loader_alive(is_alive)) {
// remove this guy
*adr_implementor() = NULL;
Klass** klass = adr_implementor();
assert(klass != NULL, "null klass");
if (klass != NULL) {
*klass = NULL;
}
}
}
}
@ -3151,9 +3155,10 @@ void InstanceKlass::verify_on(outputStream* st) {
if (protection_domain() != NULL) {
guarantee(protection_domain()->is_oop(), "should be oop");
}
if (host_klass() != NULL) {
guarantee(host_klass()->is_metadata(), "should be in metaspace");
guarantee(host_klass()->is_klass(), "should be klass");
const Klass* host = host_klass();
if (host != NULL) {
guarantee(host->is_metadata(), "should be in metaspace");
guarantee(host->is_klass(), "should be klass");
}
if (signers() != NULL) {
guarantee(signers()->is_objArray(), "should be obj array");