dnrops
/
radare2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #423 - asm.tabs parser to bound words between brackets

This commit is contained in:
pancake 2013-12-06 02:44:43 +01:00
parent 171c40129f
commit 44a959fa78
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libr/core/disasm.c
View File

@ -566,15 +566,20 @@ toro:
r_str_case (asmop.buf_asm, 1); r_str_case (asmop.buf_asm, 1);
if (atabs) { if (atabs) {
int n, i = 0, comma = 0, word = 0; int n, i = 0, comma = 0, word = 0;
int brackets = 0;
char *t, *b; char *t, *b;
free (opstr); free (opstr);
opstr = b = malloc (strlen (asmop.buf_asm)* (atabs+1)*4); opstr = b = malloc (strlen (asmop.buf_asm)* (atabs+1)*4);
strcpy (b, asmop.buf_asm); strcpy (b, asmop.buf_asm);
for (; *b; b++, i++) { for (; *b; b++, i++) {
if (*b=='(' || *b=='[') brackets++;
if (*b==')' || *b==']') brackets--;
if (*b==',') comma = 1; if (*b==',') comma = 1;
if (*b!=' ') continue; if (*b!=' ') continue;
if (word>0 && !comma) continue; //&& b[1]=='[') continue; if (word>0 && !comma) continue; //&& b[1]=='[') continue;
if (brackets>0) continue;
comma = 0; comma = 0;
brackets = 0;
n = (atabs-i); n = (atabs-i);
t = strdup (b+1); //XXX slow! t = strdup (b+1); //XXX slow!
if (n<1) n = 1; if (n<1) n = 1;