Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-31 18:43:28 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix CID 1191960

Browse Source
This commit is contained in:
Anton Kochkov 2014-05-04 19:21:05 +04:00
parent f762584982
commit 547ead1fb9
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libr/core/disasm.c
View File

@ -170,14 +170,11 @@ static void handle_print_refptr (RCore *core, RDisasmState *ds);
static void handle_print_ptr (RCore *core, RDisasmState *ds, int len, int idx);
static int cmpaddr (void *_a, void *_b) {
RAnalBlock *a = _a, *b = _b;
return (a->addr > b->addr);
}
static RDisasmState * handle_init_ds (RCore * core) {
RDisasmState * ds = R_NEW0(RDisasmState);
ds->pal_comment = core->cons->pal.comment;
@ -449,7 +446,7 @@ static char *filter_refline2(RCore *core, const char *str) {
}
// XXX fix this? or just deprecate this function?
#if 0
char *p;
char *p;
char n = '|';
for (p=s; *p; p++) {
if (!strncmp (p, core->cons->vline[LINE_VERT],
@ -592,10 +589,10 @@ static void handle_atabs_option(RCore *core, RDisasmState *ds) {
}
static void handle_print_show_cursor (RCore *core, RDisasmState *ds) {
int q = core->print->cur_enabled &&
ds->cursor >= ds->index &&
int q = core->print->cur_enabled &&
ds->cursor >= ds->index &&
ds->cursor < (ds->index+ds->asmop.size);
void *p = r_bp_get (core->dbg->bp, ds->at);
r_cons_printf (p&&q?"b*":p? "b ":q?"* ":" ");
}
@ -884,7 +881,7 @@ static void handle_control_flow_comments (RCore * core, RDisasmState *ds) {
}
}
static void handle_print_lines_right (RCore *core, RDisasmState *ds){
static void handle_print_lines_right (RCore *core, RDisasmState *ds){
if (ds->linesright && ds->show_lines && ds->line) {
if (ds->show_color) {
r_cons_printf ("%s%s"Color_RESET, ds->color_flow, ds->line);
@ -924,7 +921,7 @@ static void handle_print_stackptr (RCore *core, RDisasmState *ds) {
static void handle_print_offset (RCore *core, RDisasmState *ds ) {
if (ds->show_offset)
r_print_offset (core->print, ds->at, (ds->at==ds->dest),
r_print_offset (core->print, ds->at, (ds->at==ds->dest),
ds->show_offseg);
}
@ -1036,6 +1033,10 @@ static int handle_print_meta_infos (RCore * core, RDisasmState *ds, ut8* buf, in
break;
}
}
if (MI.str) {
free (MI.str);
MI.str = NULL;
}
}
return ret;
}
@ -1414,7 +1415,7 @@ static void handle_print_refptr_meta_infos (RCore *core, RDisasmState *ds, ut64
default:
eprintf ("unknown type '%c'\n", mi2->type);
break;
}
}
} else {
mi2 = r_meta_find (core->anal, (ut64)ds->analop.ptr,
R_META_TYPE_ANY, R_META_WHERE_HERE);
@ -1627,9 +1628,9 @@ toro:
handle_print_ptr (core, ds, len, idx);
}
handle_print_comments_right (core, ds);
if ( !(ds->show_comments &&
ds->show_comment_right &&
ds->comment))
if ( !(ds->show_comments &&
ds->show_comment_right &&
ds->comment))
r_cons_newline ();
if (ds->line) {

2
libr/debug/plugin.c
View File

@ -3,7 +3,7 @@
#include <r_debug.h>
#include "../config.h"
static RDebugPlugin *debug_static_plugins[] =
static RDebugPlugin *debug_static_plugins[] =
{ R_DEBUG_STATIC_PLUGINS };
R_API int r_debug_plugin_init(RDebug *dbg) {

2
libr/debug/reg.c
View File

@ -106,7 +106,7 @@ R_API int r_debug_reg_list(RDebug *dbg, int type, int size, int rad) {
case 2:
{
char whites[16];
strcpy (whites, kwhites);
strcpy (whites, kwhites);
if (delta) // TODO: DO NOT COLORIZE ALWAYS ..do debug knows about console?? use inverse colors
dbg->printf (Color_BWHITE);
if (item->flags) {