Skip to content

fix: dedup ELF info lookup into helper #3

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

Open
beakthoven wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: dedup ELF info lookup into helper #3

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
22 changes: 8 additions & 14 deletions src/plti.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,16 +342,18 @@ static bool plti_internal_set_got_entry(struct elf_info *info, uintptr_t got_add
return true;
}

static bool plti_internal_add_hook(struct plti *ctx, const char *lib_name, const char *name, bool by_prefix, void *new_callback, void **backup) {
struct elf_info *target_info = NULL;
static struct elf_info *plti_find_elf_info(struct plti *ctx, const char *lib_name) {
for (size_t i = 0; i < ctx->elf_image_count; i++) {
if (!strstr(ctx->elf_infos[i].path, lib_name)) continue;

target_info = &ctx->elf_infos[i];

break;
return &ctx->elf_infos[i];
}

return NULL;
}

static bool plti_internal_add_hook(struct plti *ctx, const char *lib_name, const char *name, bool by_prefix, void *new_callback, void **backup) {
struct elf_info *target_info = plti_find_elf_info(ctx, lib_name);
if (!target_info) {
LOGE("Failed to find ELF image for library for hook %s: %s", name, lib_name);

Expand Down Expand Up @@ -467,15 +469,7 @@ bool plti_add_hook_by_prefix(struct plti *ctx, const char *lib_name, const char
/* TODO: Perhaps: When registering hooks by prefix, add their full name to the array, and de-registering will only
remove those targets. For now, removing any that matches so, even manual, is very acceptable. */
static bool plti_internal_remove_hook(struct plti *ctx, const char *lib_name, const char *name, void *original_callback) {
struct elf_info *target_info = NULL;
for (size_t i = 0; i < ctx->elf_image_count; i++) {
if (!strstr(ctx->elf_infos[i].path, lib_name)) continue;

target_info = &ctx->elf_infos[i];

break;
}

struct elf_info *target_info = plti_find_elf_info(ctx, lib_name);
if (!target_info) {
LOGE("Failed to find ELF image for library for removing hook %s: %s", name, lib_name);

Expand Down
Loading