d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not depend on existence of _end symbol in obj_from_addr, use

Browse Source 
obj->mapbase and obj->mapsize instead.

Prompted by: 	OpenOffice debugging session at last BSDCon.
This commit is contained in:
Alexander Kabaev 2004-02-25 17:06:16 +00:00
parent c3c75c8376
commit 2627f3570d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=126236
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libexec/rtld-elf/rtld.c
View File

@ -54,7 +54,6 @@
#include "rtld.h"
#include "libmap.h"
#define END_SYM "_end"
#define PATH_RTLD "/libexec/ld-elf.so.1"
/* Types. */
@ -1229,18 +1228,12 @@ load_object(char *path)
static Obj_Entry *
obj_from_addr(const void *addr)
{
unsigned long endhash;
Obj_Entry *obj;
endhash = elf_hash(END_SYM);
for (obj = obj_list; obj != NULL; obj = obj->next) {
const Elf_Sym *endsym;
if (addr < (void *) obj->mapbase)
continue;
if ((endsym = symlook_obj(END_SYM, endhash, obj, true)) == NULL)
continue; /* No "end" symbol?! */
if (addr < (void *) (obj->relocbase + endsym->st_value))
if (addr < (void *) (obj->mapbase + obj->mapsize))
return obj;
}
return NULL;