Skip to content
Snippets Groups Projects
Commit 91bde1d7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "gracefully handle hashtab_search failures"

parents dbddbe42 bb880a28
No related branches found
No related tags found
No related merge requests found
......@@ -116,11 +116,16 @@ void *init_type_iter(void *policydbp, const char *type, bool is_attr)
} else {
out->alltypes = TYPE_ITER_LOOKUP;
out->d = static_cast<type_datum *>(hashtab_search(db->p_types.table, type));
if (out->d == nullptr) {
std::cerr << "\"" << type << "\" does not exist" << std::endl;
free(out);
return nullptr;
}
if (is_attr && out->d->flavor != TYPE_ATTRIB) {
std::cerr << "\"" << type << "\" MUST be an attribute in the policy" << std::endl;
free(out);
return nullptr;
} else if (!is_attr && out->d->flavor !=TYPE_TYPE) {
} else if (!is_attr && out->d->flavor != TYPE_TYPE) {
std::cerr << "\"" << type << "\" MUST be a type in the policy" << std::endl;
free(out);
return nullptr;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment