Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-11 09:05:33 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix #1031 - incorrect call offsets calculated in DOS EXEs

Browse Source 
Also fix the incorrect MZ entrypoint calculation.
This commit is contained in:
Joshua Roys 2014-06-14 09:12:23 -04:00 committed by pancake
parent 8d84f4b30f
commit 62b2c60031
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libr/anal/p/anal_x86_udis.c
View File

@ -131,7 +131,7 @@ static st64 getval(ud_operand_t *op) {
int bits = op->size;
switch (op->type) {
case UD_OP_PTR:
return (op->lval.ptr.seg<<4) | (op->lval.ptr.off & 0xFFFF);
return (op->lval.ptr.seg<<4) + (op->lval.ptr.off & 0xFFFF);
default:
break;
}
@ -385,9 +385,11 @@ default:
op->type = R_ANAL_OP_TYPE_UCALL;
op->jump = 0; // EAX, EBX, ... use anal->reg
break;
case UD_OP_PTR:
op->jump = (int)getval (&u.operand[0]);
break;
case UD_OP_IMM:
case UD_OP_MEM:
case UD_OP_PTR:
default:
op->jump = addr + oplen + (int)getval (&u.operand[0]);
}

3
libr/bin/p/bin_mz.c
View File

@ -71,8 +71,7 @@ static RList* entries(RBinFile *arch) {
if (!(ret = r_list_new ()))
return NULL;
ret->free = free;
off = exe->header_paragraphs * 16L;
off += exe->ip; // XXX
off = (exe->cs << 4) + exe->ip;
if ((ptr = R_NEW (RBinAddr))) {
ptr->paddr = off;
ptr->vaddr = off;