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

More glitchfixing for disasm

Browse Source
This commit is contained in:
pancake 2017-01-24 11:36:02 +01:00
parent 4c6b418351
commit b65403abb4
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libr/cons/cons.c
View File

@ -853,8 +853,9 @@ R_API void r_cons_memcat(const char *str, int len) {
R_API void r_cons_memset(char ch, int len) {
if (!I.null && len > 0) {
palloc (len + 1);
memset (I.buffer + I.buffer_len, ch, len + 1);
memset (I.buffer + I.buffer_len, ch, len);
I.buffer_len += len;
I.buffer[I.buffer_len] = 0;
}
}

14
libr/core/disasm.c
View File

@ -2412,16 +2412,11 @@ static void ds_align_comment(RDisasmState *ds) {
int cells = utf8len - (cstrlen - ansilen);
if (cstrlen < 20) {
ds_print_pre (ds);
ds_print_lines_left (ds);
}
cols = ds->interactive ? ds->core->cons->columns : 1024;
//cols = r_cons_get_size (NULL);
if (cmtcol + 16 >= cols) {
if (cells < cmtcol) {
int len = cmtcol - cells;
r_cons_memset (' ', len);
} else if (cells < cmtcol) {
int len = cmtcol - cells;
if (len < cols) {
if (len < cols && len > 0) {
r_cons_memset (' ', len);
}
}
@ -2956,8 +2951,9 @@ static void delete_last_comment(RDisasmState *ds) {
if (ll) {
const char *begin = r_str_nstr (ll, "; ", len);
if (begin) {
const int cstrlen = ll + len - begin;
r_cons_drop (cstrlen - (int)(begin - ll));
const int cstrlen = begin + len - ll;
// r_cons_drop (cstrlen - (int)(begin - ll));
r_cons_newline();
}
}
}