Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Doh, Elf32_Word is unsigned, so st_size cannot go below zero.

Browse Source 
Also made elf_lookup_symbol_address() less restrictive with respect to the
ELF symbol found (it now accepts all types, not only functions).


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7714 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2004-06-01 00:35:55 +00:00
parent 6444e8f7bf
commit 755b059fc1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/kernel/core/elf.c
View File

@ -313,7 +313,8 @@ dump_symbols(int argc, char **argv)
for (i = 0; i < image->num_debug_symbols; i++) {
struct Elf32_Sym *symbol = &image->debug_symbols[i];
if (symbol->st_value == 0 || symbol->st_size < 0)
if (symbol->st_value == 0
|| symbol->st_size >= image->regions[0].size + image->regions[1].size)
continue;
dprintf("%08lx %s/%s %5ld %s\n", symbol->st_value + image->regions[0].delta,
@ -328,7 +329,8 @@ dump_symbols(int argc, char **argv)
for (j = HASHBUCKETS(image)[i]; j != STN_UNDEF; j = HASHCHAINS(image)[j]) {
struct Elf32_Sym *symbol = &image->syms[j];
if (symbol->st_value == 0 || symbol->st_size < 0)
if (symbol->st_value == 0
|| symbol->st_size >= image->regions[0].size + image->regions[1].size)
continue;
dprintf("%08lx %s/%s %5ld %s\n", symbol->st_value + image->regions[0].delta,
@ -909,7 +911,8 @@ elf_lookup_symbol_address(addr_t address, addr_t *_baseAddress, const char **_sy
for (i = 0; i < image->num_debug_symbols; i++) {
struct Elf32_Sym *symbol = &image->debug_symbols[i];
if (ELF32_ST_TYPE(symbol->st_info) != STT_FUNC)
if (symbol->st_value == 0
|| symbol->st_size >= image->regions[0].size + image->regions[1].size)
continue;
symbolDelta = address - (symbol->st_value + image->regions[0].delta);
@ -934,7 +937,8 @@ elf_lookup_symbol_address(addr_t address, addr_t *_baseAddress, const char **_sy
for (j = HASHBUCKETS(image)[i]; j != STN_UNDEF; j = HASHCHAINS(image)[j]) {
struct Elf32_Sym *symbol = &image->syms[j];
if (ELF32_ST_TYPE(symbol->st_info) != STT_FUNC)
if (symbol->st_value == 0
|| symbol->st_size >= image->regions[0].size + image->regions[1].size)
continue;
symbolDelta = address - (long)(symbol->st_value + image->regions[0].delta);