Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ternary null check found by clang static analysis #176

Merged
merged 1 commit into from
Nov 30, 2020
Merged

Fix ternary null check found by clang static analysis #176

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/class_loader_core.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ void addClassLoaderOwnerForAllExistingMetaObjectsForLibrary(
reinterpret_cast<void *>(meta_obj), meta_obj->baseClassName().c_str(),
meta_obj->className().c_str(),
reinterpret_cast<void *>(loader),
nullptr == loader ? loader->getLibraryPath().c_str() : "NULL");
nullptr == loader ? "NULL" : loader->getLibraryPath().c_str());
meta_obj->addOwningClassLoader(loader);
}
}
Expand All @@ -362,7 +362,7 @@ void revivePreviouslyCreateMetaobjectsFromGraveyard(
"bound to ClassLoader %p (library path = %s)",
obj->className().c_str(), obj->baseClassName().c_str(), reinterpret_cast<void *>(obj),
reinterpret_cast<void *>(loader),
nullptr == loader ? loader->getLibraryPath().c_str() : "NULL");
nullptr == loader ? "NULL" : loader->getLibraryPath().c_str());

obj->addOwningClassLoader(loader);
assert(obj->typeidBaseClassName() != "UNSET");
Expand Down Expand Up @@ -391,7 +391,7 @@ void purgeGraveyardOfMetaobjects(
".bound to ClassLoader %p (library path = %s)",
obj->className().c_str(), obj->baseClassName().c_str(), reinterpret_cast<void *>(obj),
reinterpret_cast<void *>(loader),
nullptr == loader ? loader->getLibraryPath().c_str() : "NULL");
nullptr == loader ? "NULL" : loader->getLibraryPath().c_str());

bool is_address_in_graveyard_same_as_global_factory_map =
std::find(all_meta_objs.begin(), all_meta_objs.end(), *itr) != all_meta_objs.end();
Expand Down