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

Fix invalid json in agfj under some situations (#13051)

Browse Source 
If, for whatever reason, a basic block with negative size is
contained in a function the json produced is not valid.
This commit is contained in:
blenk92 2019-02-12 10:51:28 +01:00 committed by radare
parent 86f43531c1
commit 94a1c89d58
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libr/core/canal.c
View File

@ -1230,20 +1230,19 @@ static int core_anal_graph_nodes(RCore *core, RAnalFunction *fcn, int opts) {
}
r_cons_printf (",\"colorize\":%d", bbi->colorize);
r_cons_printf (",\"ops\":");
r_cons_print ("[");
if (buf) {
r_io_read_at (core->io, bbi->addr, buf, bbi->size);
if (is_json_format_disasm) {
r_core_print_disasm (core->print, core, bbi->addr, buf, bbi->size, bbi->size, 0, 1, true, NULL);
} else {
r_cons_print ("[");
r_core_print_disasm_json (core, bbi->addr, buf, bbi->size, 0);
r_cons_print ("]");
}
free (buf);
} else {
eprintf ("cannot allocate %d byte(s)\n", bbi->size);
}
r_cons_print ("}");
r_cons_print ("]}");
continue;
}
if (bbi->jump != UT64_MAX) {