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

* Fix asm.nbytes

Browse Source 
* Fix overflow in r_print_hexpair()
* Fix bytes alignment
This commit is contained in:
Nibble 2011-03-04 02:10:25 +01:00
parent 13d6a9f2c8
commit 88be7aace4
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libr/core/cmd.c
View File

@ -168,8 +168,9 @@ static void r_print_disasm(RPrint *p, RCore *core, ut64 addr, ut8 *buf, int len,
int lbytes = r_config_get_i (core->config, "asm.lbytes");
int linesopts = 0;
const char *pre = " ";
nb = nbytes*2;
core->inc = 0;
nb = (nbytes*2);
core->inc = 0;
if (core->print->cur_enabled) {
if (core->print->cur<0)
@ -372,21 +373,25 @@ if (core->inc == 0)
flag =NULL; // HACK
if (!flag) {
str = strdup (asmop.buf_hex);
if (strlen (str) > nb) {
str[nb] = '.';
str[nb+1] = '\0';
if (r_str_ansi_len (str) > nb) {
char *p = r_str_ansi_chrn (str, nb);
if (p) {
p[0] = '.';
p[1] = '\0';
}
*extra = 0;
}
k = nb-strlen (str);
k = nb-r_str_ansi_len (str);
if (k<0) k = 0;
if (lbytes && str[strlen(str)-1]!='.') k = k + 1;
for (j=0; j<k; j++)
pad[j] = ' ';
pad[j] = '\0';
if (lbytes) {
// hack to align bytes left
strcpy (extra, pad);
*pad=0;
}
if (lbytes) {
// hack to align bytes left
strcpy (extra, pad);
*pad=0;
}
if (show_color) {
char *nstr;
p->cur_enabled = cursor!=-1;
@ -412,7 +417,7 @@ strcpy (extra, pad);
r_cons_printf (" %s %s %s"Color_RESET, pad, str, extra);
else r_cons_printf (" %s %s %s", pad, str, extra);
}
free (str);
if (!show_color) free (str);
}
if (show_color) {

2
libr/print/print.c
View File

@ -76,7 +76,7 @@ R_API void r_print_addr(RPrint *p, ut64 addr) {
// XXX: redesign ? :)
R_API char *r_print_hexpair(RPrint *p, const char *str, int n) {
const char *s;
char *d, *dst = (char *)malloc ((strlen (str)+2)*6);
char *d, *dst = (char *)malloc ((strlen (str)+2)*32);
int ch, i;
/* XXX That's hacky as shit.. but partially works O:) */
/* TODO: Use r_print_set_cursor for win support */