Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-02 03:32:04 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix #2228 DESU DESU DESU DESU DESU DESU

Browse Source
This commit is contained in:
pancake 2015-10-01 21:04:38 +02:00
parent e7165f8832
commit 24e2bed757
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/core/bin.c
View File

@ -1010,7 +1010,7 @@ static int bin_symbols_internal(RCore *r, int mode, ut64 laddr, int va, ut64 at,
"\"vaddr\":%"PFMT64d","
"\"paddr\":%"PFMT64d"}",
iter->p?",":"", str,
sn.demname,
sn.demname? sn.demname: "",
sn.nameflag,
symbol->size,
addr, symbol->paddr);

23
libr/core/cmd_debug.c
View File

@ -2051,8 +2051,26 @@ static void r_core_debug_esil (RCore *core, const char *input) {
r_debug_esil_watch_reset (core->dbg);
break;
case 's':
if (input[1] == '?' || !input[1]) {
eprintf ("Usage: des [num-of-instructions]\n");
if (input[1] == 'u' && input[2] == ' ') { // "desu"
ut64 addr, naddr, fin = r_num_math (core->num, input+2);
r_core_cmd0 (core, "aei");
addr = r_debug_reg_get (core->dbg, "pc");
while (addr != fin) {
r_debug_esil_prestep (core->dbg, r_config_get_i (
core->config, "esil.prestep"));
r_debug_esil_step (core->dbg, 1);
naddr = r_debug_reg_get (core->dbg, "pc");
if (naddr == addr) {
eprintf ("Detected loophole\n");
break;
}
addr = naddr;
}
} else if (input[1] == '?' || !input[1]) {
// TODO: use r_core_help here
eprintf ("Usage: des[u] [arg]\n");
eprintf (" des [num-of-instructions]\n");
eprintf (" desu [address]\n");
} else {
r_core_cmd0 (core, "aei");
r_debug_esil_prestep (core->dbg, r_config_get_i (core->config, "esil.prestep"));
@ -2085,6 +2103,7 @@ static void r_core_debug_esil (RCore *core, const char *input) {
eprintf ("> de x m FROM..TO # stop when rip in range\n");
eprintf ("> dec # continue execution until matching expression\n");
eprintf ("> des [num] # step-in N instructions with esildebug\n");
eprintf ("> desu [addr] # esildebug until specific address\n");
eprintf ("TODO: Add support for conditionals in expressions like rcx == 4 or rcx<10\n");
eprintf ("TODO: Turn on/off debugger trace of esil debugging\n");
break;

2
libr/util/buf.c
View File

@ -112,7 +112,7 @@ static int sparse_limits(RList *l, ut64 *min, ut64 *max) {
R_API RBuffer *r_buf_new_with_pointers (const ut8 *bytes, ut64 len) {
RBuffer *b = r_buf_new ();
if (bytes && (len > 0 && len != UT64_MAX)) {
b->buf = bytes;
b->buf = (ut8*)bytes;
b->length = len;
b->empty = false;
b->ro = true;