dnrops
/
radare2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Blind ELF fixes ##bin

This commit is contained in:
pancake 2023-03-21 14:44:36 +01:00 committed by GitHub
parent 66d67346de
commit ef8ec63747
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libr/bin/format/elf/elf.c
View File

@ -3615,13 +3615,15 @@ RBinSymbol *Elf_(_r_bin_elf_convert_symbol)(struct Elf_(r_bin_elf_obj_t) *bin,
static ut32 hashRBinElfSymbol(const void *obj) {
const RBinElfSymbol *symbol = (const RBinElfSymbol *)obj;
if (!symbol || !*symbol->name) {
if (!symbol || R_STR_ISEMPTY (symbol->name)) {
return 0;
}
int hash = sdb_hash (symbol->name);
hash ^= sdb_hash (symbol->type);
if (R_STR_ISNOTEMPTY (symbol->type)) {
hash ^= sdb_hash (symbol->type);
}
hash ^= (symbol->offset >> 32);
hash ^= (symbol->offset & 0xffffffff);
hash ^= (symbol->offset & UT32_MAX);
return hash;
}
@ -3629,10 +3631,16 @@ static int cmp_RBinElfSymbol(const RBinElfSymbol *a, const RBinElfSymbol *b) {
if (a->offset != b->offset) {
return 1;
}
if (!a->name || !b->name) {
return 1;
}
int result = strcmp (a->name, b->name);
if (result != 0) {
return result;
}
if (!a->type || !b->type) {
return 1;
}
return strcmp (a->type, b->type);
}
@ -3943,15 +3951,14 @@ static RBinElfSymbol* Elf_(_r_bin_elf_get_symbols_imports)(ELFOBJ *bin, int type
goto beach;
}
import_ret_ctr = 0;
i = -1;
while (!ret[++i].last) {
for (i = 0; !ret[i].last; i++) {
if (!(import_sym_ptr = Elf_(_r_bin_elf_convert_symbol) (bin, &ret[i], "%s"))) {
continue;
}
setsymord (bin, import_sym_ptr->ordinal, import_sym_ptr);
if (ret[i].is_imported) {
memcpy (&import_ret[import_ret_ctr], &ret[i], sizeof (RBinElfSymbol));
++import_ret_ctr;
import_ret_ctr++;
}
}
import_ret[import_ret_ctr].last = 1;