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

core/graph: fix undefined behaviour in event_resize callback

Browse Source 
* fix bug in VV introduced by f802bdf3b1
* code refactoring
This commit is contained in:
Riccardo Schirone 2015-06-11 12:23:30 +02:00 committed by pancake
parent 5954f6e046
commit 33a550aa23
4 changed files with 26 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/core/cmd_anal.c
View File

@ -881,7 +881,7 @@ static int cmd_anal_fcn(RCore *core, const char *input) {
}
break;
case 'g': // "afg" - non-interactive VV
r_core_fcn_graph (core, NULL);
r_core_visual_graph (core, NULL, R_FALSE);
break;
case '?':{ // "af?"
const char* help_msg[] = {

78
libr/core/graph.c
View File

@ -55,21 +55,11 @@ struct graph {
int force_update_seek;
};
#if 0
static Node nodes[] = {
{25,4, 18, 6, 0x8048320, "push ebp\nmov esp, ebp\njz 0x8048332" },
{10,13, 18, 5, 0x8048332, "xor eax, eax\nint 0x80\n"},
{30,13, 18, 5, 0x8048324, "pop ebp\nret"},
{NULL}
struct graph_refresh_data {
struct graph *g;
int fs;
};
static Edge edges[] = {
{ 0, 0, 1 },
{ 1, 0, 2 },
{ -1 }
};
#endif
#define G(x,y) r_cons_canvas_gotoxy (g->can, x, y)
#define W(x) r_cons_canvas_write (g->can, x)
#define B(x,y,w,h) r_cons_canvas_box(g->can, x,y,w,h,NULL)
@ -660,8 +650,10 @@ static void graph_prev_node(struct graph *g) {
graph_update_seek (g, g->curnode, R_FALSE);
}
static int graph_refresh(struct graph *g, int fs) {
static int graph_refresh(struct graph_refresh_data *grd) {
char title[128];
struct graph *g = grd->g;
int fs = grd->fs;
int h, w = r_cons_get_size (&h);
int ret;
@ -695,7 +687,8 @@ static int graph_refresh(struct graph *g, int fs) {
r_cons_clear00 ();
}
r_cons_canvas_resize (g->can, w, 1024);
h = fs ? h : 1024;
r_cons_canvas_resize (g->can, w, h);
r_cons_canvas_clear (g->can);
graph_print_edges(g);
@ -759,46 +752,11 @@ static struct graph *graph_new(RCore *core, RConsCanvas *can, RAnalFunction *fcn
return g;
}
R_API int r_core_fcn_graph(RCore *core, RAnalFunction *_fcn) {
RAnalFunction *fcn;
RConsCanvas *can;
struct graph *g;
int h;
fcn = _fcn? _fcn: r_anal_get_fcn_in (core->anal, core->offset, 0);
if (!fcn) {
eprintf ("No function in current seek\n");
return R_FALSE;
}
(void)r_cons_get_size (&h);
can = r_cons_canvas_new (1,1); //w - 1, h - 1);
if (!can) {
eprintf ("Cannot create RCons.canvas context\n");
return R_FALSE;
}
can->linemode = 1;
can->color = r_config_get_i (core->config, "scr.color");
// disable colors in disasm because canvas doesnt supports ansi text yet
r_config_set_i (core->config, "scr.color", 0);
g = graph_new (core, can, fcn);
if (!g) {
goto err_graph_new;
}
(void)graph_refresh (g, 0);
r_cons_printf (Color_RESET);
graph_free (g);
err_graph_new:
r_config_set_i (core->config, "scr.color", can->color);
free (can);
return 0;
}
R_API int r_core_visual_graph(RCore *core, RAnalFunction *_fcn) {
R_API int r_core_visual_graph(RCore *core, RAnalFunction *_fcn, int is_interactive) {
RAnalFunction *fcn;
RConsCanvas *can;
struct graph *g;
struct graph_refresh_data *grd;
int ret;
int wheelspeed;
int okey, key, wheel;
@ -811,7 +769,7 @@ R_API int r_core_visual_graph(RCore *core, RAnalFunction *_fcn) {
return R_FALSE;
}
w = r_cons_get_size (&h);
can = r_cons_canvas_new (w - 1, h - 1);
can = r_cons_canvas_new (w, h);
if (!can) {
eprintf ("Cannot create RCons.canvas context\n");
return R_FALSE;
@ -827,17 +785,27 @@ R_API int r_core_visual_graph(RCore *core, RAnalFunction *_fcn) {
goto err_graph_new;
}
core->cons->event_data = g;
grd = (struct graph_refresh_data *)malloc (sizeof(*grd));
grd->g = g;
grd->fs = is_interactive;
core->cons->event_data = grd;
core->cons->event_resize = (RConsEvent)graph_refresh;
while (!exit_graph && !is_error) {
w = r_cons_get_size (&h);
ret = graph_refresh (g, 1);
ret = graph_refresh (grd);
if (!ret) {
is_error = R_TRUE;
break;
}
if (!is_interactive) {
/* this is a non-interactive ascii-art graph, so exit the loop */
r_cons_printf (Color_RESET);
break;
}
r_cons_show_cursor(R_FALSE);
wheel = r_config_get_i (core->config, "scr.wheel");
if (wheel)

2
libr/core/visual.c
View File

@ -1036,7 +1036,7 @@ R_API int r_core_visual_cmd(RCore *core, int ch) {
r_core_cmd0 (core, "agv $$");
} else {
int ocolor = r_config_get_i (core->config, "scr.color");
r_core_visual_graph (core, NULL);
r_core_visual_graph (core, NULL, R_TRUE);
r_config_set_i (core->config, "scr.color", ocolor);
}
break;

2
libr/include/r_core.h
View File

@ -210,7 +210,7 @@ R_API int r_core_shift_block(RCore *core, ut64 addr, ut64 b_size, st64 dist);
R_API void r_core_visual_prompt_input (RCore *core);
R_API int r_core_visual_types(RCore *core);
R_API int r_core_visual(RCore *core, const char *input);
R_API int r_core_visual_graph(RCore *core, RAnalFunction *_fcn);
R_API int r_core_visual_graph(RCore *core, RAnalFunction *_fcn, int is_interactive);
R_API int r_core_fcn_graph(RCore *core, RAnalFunction *_fcn);
R_API int r_core_visual_panels(RCore *core);
R_API int r_core_visual_cmd(RCore *core, int ch);