Skip to content

Allow iterator to return ELF_ITER_NOTFOUND when not found. #14

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

Merged
elfmaster merged 1 commit into from
Feb 7, 2020
Merged

Allow iterator to return ELF_ITER_NOTFOUND when not found. #14

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
11 changes: 8 additions & 3 deletions src/libelfmaster.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1690,7 +1690,7 @@ elf_shared_object_iterator_next(struct elf_shared_object_iterator *iter,
entry->basename = iter->current->basename;
iter->current = LIST_NEXT(iter->current, _linkage);

if (entry->path == NULL) {
if (entry->path == NULL) {
return ELF_ITER_NOTFOUND;
}
if (ldso_insert_yield_cache(iter, entry->path) == false) {
Expand All @@ -1702,9 +1702,14 @@ elf_shared_object_iterator_next(struct elf_shared_object_iterator *iter,
}
entry->path = (char *)ldso_cache_bsearch(iter, iter->current->basename);
if (entry->path == NULL) {
elf_error_set(error, "ldso_cache_bsearch(%p, %s) failed",
// dependancy was not found on current system, return expected values
// to point to next dependancy while informing caller that it was just NOTFOUND
elf_error_set(error, "ldso_cache_bsearch(%p, %s) failed to find",
iter, iter->current->basename);
goto err;
entry->path = iter->current->path;
entry->basename = iter->current->basename;
iter->current = LIST_NEXT(iter->current, _linkage);
return ELF_ITER_NOTFOUND;
}

next_basename:
Expand Down