diff options
| author | Eric Andersen <andersen@codepoet.org> | 2003-06-16 07:34:25 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2003-06-16 07:34:25 +0000 |
| commit | c4de707a42f04d657367a08a9a4222ceee05f2e3 (patch) | |
| tree | 26149687d2c98365ba966230aa35bd034a79373d | |
| parent | b34bab24093904492a924303d4e24faffee2cd87 (diff) | |
Fix a segfault when used on a library w/o an INTERP program header.
| -rw-r--r-- | ldso/util/ldd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ldso/util/ldd.c b/ldso/util/ldd.c index 661fb865f..b7a8dfe3a 100644 --- a/ldso/util/ldd.c +++ b/ldso/util/ldd.c @@ -122,6 +122,7 @@ char not_found[] = "not found"; char *interp = NULL; char *interp_dir = NULL; int byteswap; +static int interpreter_already_found=0; inline uint32_t byteswap32_to_host(uint32_t value) { @@ -352,7 +353,7 @@ static int add_library(Elf32_Ehdr* ehdr, Elf32_Dyn* dynamic, int is_setuid, char } /* We add libc.so.0 elsewhere */ - if ((tmp=strrchr(interp, '/')) != NULL) + if (interpreter_already_found && (tmp=strrchr(interp, '/')) != NULL) { int len = strlen(interp_dir); if (strcmp(s, interp+1+len)==0) @@ -409,14 +410,12 @@ static void find_needed_libraries(Elf32_Ehdr* ehdr, Elf32_Dyn* dynamic, char *st } } -static int interpreter_already_found=0; static struct library * find_elf_interpreter(Elf32_Ehdr* ehdr) { Elf32_Phdr *phdr; if (interpreter_already_found==1) return NULL; - interpreter_already_found=1; phdr = elf_find_phdr_type(PT_INTERP, ehdr); if (phdr) { struct library *cur, *newlib=NULL; @@ -467,6 +466,7 @@ static struct library * find_elf_interpreter(Elf32_Ehdr* ehdr) cur->next = newlib; } #endif + interpreter_already_found=1; return newlib; } return NULL; |