Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-12-13 07:57:35 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fix crash due to latest changes in anal

Browse Source
This commit is contained in:
Álvaro Felipe Melchor 2016-09-07 20:06:36 +02:00
parent a458a36814
commit 7826f7fda7
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libr/anal/p/anal_x86_cs.c
View File

@ -1418,7 +1418,7 @@ static int parse_reg_name_mov(RRegItem *reg, csh *handle, cs_insn *insn, int reg
switch (INSOP (reg_num).type) {
case X86_OP_REG:
reg->name = cs_reg_name (*handle, INSOP (reg_num).reg);
reg->name = (char *)cs_reg_name (*handle, INSOP (reg_num).reg);
break;
default:
break;
@ -1433,13 +1433,13 @@ static int parse_reg_name_lea(RRegItem *reg, csh *handle, cs_insn *insn, int reg
switch (INSOP (reg_num).type) {
case X86_OP_REG:
reg->name = cs_reg_name (*handle, INSOP(reg_num).reg);
reg->name = (char *)cs_reg_name (*handle, INSOP(reg_num).reg);
break;
case X86_OP_MEM:
if (INSOP (reg_num).mem.base != X86_REG_INVALID) {
reg->name = cs_reg_name (*handle, INSOP (reg_num).mem.base);
reg->name = (char *)cs_reg_name (*handle, INSOP (reg_num).mem.base);
} else if (INSOP (reg_num).mem.index != X86_REG_INVALID) {
reg->name = cs_reg_name (*handle, INSOP (reg_num).mem.index);
reg->name = (char *)cs_reg_name (*handle, INSOP (reg_num).mem.index);
}
break;
default:
@ -1674,14 +1674,14 @@ static void anop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len, csh
op->ptr = UT64_MAX;
op->src[0] = r_anal_value_new ();
op->src[0]->reg = r_reg_new ();
op->src[0]->reg = R_NEW0 (RRegItem);
op->dst = r_anal_value_new ();
parse_reg_name_mov (op->src[0]->reg, &gop.handle, insn, 1);
switch (INSOP(0).type) {
case X86_OP_MEM:
op->dst->reg = r_reg_new ();
op->dst->reg = R_NEW0 (RRegItem);
parse_reg_name_mov (op->dst->reg, &gop.handle, insn, 0);
op->ptr = INSOP(0).mem.disp;
@ -1823,11 +1823,10 @@ static void anop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len, csh
break;
case X86_INS_LEA:
op->type = R_ANAL_OP_TYPE_LEA;
op->src[0] = r_anal_value_new ();
op->src[0]->reg = r_reg_new ();
op->src[0]->reg = R_NEW0 (RRegItem);
op->dst = r_anal_value_new ();
op->dst->reg = r_reg_new ();
op->dst->reg = R_NEW0 (RRegItem);
parse_reg_name_lea (op->src[0]->reg, &gop.handle, insn, 1);
parse_reg_name_mov (op->dst->reg, &gop.handle, insn, 0);

6
libr/core/disasm.c
View File

@ -1817,10 +1817,10 @@ static void ds_instruction_mov_lea(RDisasmState *ds, int idx) {
const char *pc = core->anal->reg->name[R_REG_NAME_PC];
RAnalValue *dst = ds->analop.dst;
if (dst && dst->reg && dst->reg->name)
if (!strcmp (src->reg->name, pc)) {
if (src->reg->name && pc && !strcmp (src->reg->name, pc)) {
RFlagItem *item;
ut8 b[8];
ut64 ptr = idx+ds->addr+src->delta+ds->analop.size;
ut64 ptr = idx + ds->addr + src->delta + ds->analop.size;
ut64 off = 0LL;
r_core_read_at (core, ptr, b, src->memref);
off = r_mem_get_num (b, src->memref);
@ -1838,7 +1838,7 @@ static void ds_instruction_mov_lea(RDisasmState *ds, int idx) {
if (src && src->reg && core->anal->reg && *(core->anal->reg->name)) {
const char *pc = core->anal->reg->name[R_REG_NAME_PC];
RAnalValue *dst = ds->analop.dst;
if (dst && dst->reg && !strcmp (src->reg->name, pc)) {
if (dst && dst->reg && src->reg->name && pc && !strcmp (src->reg->name, pc)) {
int index = 0;
int memref = core->assembler->bits/8;
RFlagItem *item;