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

Fix #15165 - Assert in empty esil string for ARC emulation (#16510)

This commit is contained in:
pancake 2020-04-10 05:46:54 +02:00 committed by GitHub
parent f31e6ca527
commit b759a0b206
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libr/core/cmd_anal.c
View File

@ -4579,13 +4579,14 @@ repeat:
}
if (ret) {
r_anal_esil_set_pc (esil, addr);
const char *e = R_STRBUF_SAFEGET (&op.esil);
if (core->dbg->trace->enabled) {
RReg *reg = core->dbg->reg;
core->dbg->reg = core->anal->reg;
r_debug_trace_pc (core->dbg, addr);
core->dbg->reg = reg;
} else if (R_STR_ISNOTEMPTY (R_STRBUF_SAFEGET (&op.esil))) {
r_anal_esil_parse (esil, R_STRBUF_SAFEGET (&op.esil));
} else if (R_STR_ISNOTEMPTY (e)) {
r_anal_esil_parse (esil, e);
if (core->anal->cur && core->anal->cur->esil_post_loop) {
core->anal->cur->esil_post_loop (esil, &op);
}
@ -4622,7 +4623,10 @@ repeat:
return_tail (1);
break;
}
r_anal_esil_parse (esil, R_STRBUF_SAFEGET (&op2.esil));
const char *e = R_STRBUF_SAFEGET (&op2.esil);
if (R_STR_ISNOTEMPTY (e)) {
r_anal_esil_parse (esil, e);
}
} else {
eprintf ("Invalid instruction at 0x%08"PFMT64x"\n", naddr);
}